Post-review changes

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index c4c1b78a7cc2eda1e0ebcfc751fc43362b3c26a3..549a7d4e9531714450ecdfa6d38d292dfa866205 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -39,12 +39,13 @@ DRVTYPES = emd \
            tgi
 
 OUTPUTDIRS := lib                 \
-              target              \
               asminc              \
               cfg                 \
               include             \
               samples             \
-              $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))
+              $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))\
+              $(subst ../,,$(wildcard ../target/*/drv/*))\
+              $(subst ../,,$(wildcard ../target/*/util))\
 
 .PHONY: all mostlyclean clean install zip lib $(TARGETS)
 
@@ -77,11 +78,8 @@ all lib: $(TARGETS)
 mostlyclean:
        $(call RMDIR,../libwrk)
 
-# Transitional line active. Final line commented out below in order to
-# allow some time for transition between the directory structures
 clean:
-       $(call RMDIR,../libwrk ../lib ../targetutil ../target $(addprefix ../,$(DRVTYPES)))
-#      $(call RMDIR,../libwrk ../lib ../target)
+       $(call RMDIR,../libwrk ../lib ../target)
 
 ifdef CMD_EXE
 
@@ -95,7 +93,7 @@ define INSTALL_recipe
 
 $(if $(prefix),,$(error variable `prefix' must be set))
 $(INSTALL) -d $(DESTDIR)$(datadir)/$(dir)
-$(INSTALL) -m644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir)
+$(INSTALL) -m0644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir)
 
 endef # INSTALL_recipe