From ac5bb6707d9ccfd2f586a0de7c2bb108e5811dd5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Patrycjusz=20R=2E=20=C5=81ogiewa?= Date: Sun, 29 May 2016 16:19:03 +0200 Subject: [PATCH] Post-review changes --- doc/Makefile | 4 ++-- libsrc/Makefile | 6 +----- libsrc/nes/Makefile.inc | 14 +++++++------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 8b0b316b0..862164e1b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -33,11 +33,11 @@ install: $(if $(prefix),,$(error variable `prefix' must be set)) ifeq ($(wildcard ../html),../html) $(INSTALL) -d $(DESTDIR)$(htmldir) - $(INSTALL) -m644 ../html/*.* $(DESTDIR)$(htmldir) + $(INSTALL) -m0644 ../html/*.* $(DESTDIR)$(htmldir) endif ifeq ($(wildcard ../info),../info) $(INSTALL) -d $(DESTDIR)$(infodir) - $(INSTALL) -m644 ../info/*.* $(DESTDIR)$(infodir) + $(INSTALL) -m0644 ../info/*.* $(DESTDIR)$(infodir) endif zip: diff --git a/libsrc/Makefile b/libsrc/Makefile index 3f6d2746c..549a7d4e9 100644 --- a/libsrc/Makefile +++ b/libsrc/Makefile @@ -78,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 @@ -103,7 +100,6 @@ endef # INSTALL_recipe install: $(foreach dir,$(OUTPUTDIRS),$(INSTALL_recipe)) - endif # CMD_EXE define ZIP_recipe diff --git a/libsrc/nes/Makefile.inc b/libsrc/nes/Makefile.inc index 6f2e7c7d2..e23605781 100644 --- a/libsrc/nes/Makefile.inc +++ b/libsrc/nes/Makefile.inc @@ -1,8 +1,8 @@ ../target/nes/drv/tgi/nes-64-56-2.tgi: ../libwrk/nes/clrscr.o \ - ../libwrk/nes/cputc.o \ - ../libwrk/nes/get_tv.o \ - ../libwrk/nes/gotoxy.o \ - ../libwrk/nes/popa.o \ - ../libwrk/nes/ppu.o \ - ../libwrk/nes/ppubuf.o \ - ../libwrk/nes/setcursor.o + ../libwrk/nes/cputc.o \ + ../libwrk/nes/get_tv.o \ + ../libwrk/nes/gotoxy.o \ + ../libwrk/nes/popa.o \ + ../libwrk/nes/ppu.o \ + ../libwrk/nes/ppubuf.o \ + ../libwrk/nes/setcursor.o -- 2.39.5