X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=ccbe5f8bac240442bb73f59cdc74bfd7607afcee;hb=4ade52359b6eba3621566dac79793a33aa4c915f;hp=a99184a27da0250561160cd4064a57fdd5f25411;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823;p=xscreensaver diff --git a/Makefile.in b/Makefile.in index a99184a2..ccbe5f8b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,8 +19,8 @@ TARFILES = README README.hacking README.VMS INSTALL \ TAR = tar -MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done -MAKE_SUBDIR2 = for dir in $(SUBDIRS2);do (cd $$dir; $(MAKE) $@) || exit 5; done +MAKE_SUBDIR = for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 5; done +MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done default:: @$(MAKE_SUBDIR) @@ -45,7 +45,7 @@ depend:: distdepend:: @$(MAKE) update_spec_version @$(MAKE_SUBDIR2) - @cd po ; $(MAKE) update-po + @$(MAKE) -C po update-po TAGS:: tags tags:: @@ -284,7 +284,7 @@ test-tar:: chmod -R u+w . dmg:: - cd OSX ; $(MAKE) release dmg + $(MAKE) -C OSX release dmg www:: @ \ @@ -334,7 +334,9 @@ www:: echo '' ; \ \ for EXT in tar.gz dmg ; do \ - OLDEST=`ls xscreensaver*.$$EXT | head -n 1` ; \ + OLDEST=`ls xscreensaver*.$$EXT | \ + fgrep -v 5.14 | \ + head -n 1` ; \ /bin/echo -n "Delete $$DEST/$$OLDEST? "; \ read line; \ if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then \ @@ -349,8 +351,7 @@ www:: cat $$TMP > download.html ; \ rm -f $$TMP ; \ \ - (cd ..; $(MAKE) xscreensaver/changelog.html \ - xscreensaver/screenshots/index.html ); \ + $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \ cvs diff -U0 changelog.html ; \ set +x ; \ \