X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=9faa3ef7c61bbcdf98be1a3c1665ff0c90ef3805;hb=ff35d056d723c9a5ffe728dbba5f1c25e141be04;hp=225d1c021496ab86b96657a56ecdf61ffd6818ba;hpb=50be9bb40dc60130c99ffa568e6677779904ff70;p=xscreensaver

diff --git a/driver/Makefile.in b/driver/Makefile.in
index 225d1c02..9faa3ef7 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -239,7 +239,7 @@ MEN_OSX		= xscreensaver-getimage-desktop.man pdf2jpeg.man
 MEN		= $(MEN_1) @MEN_OSX@
 
 EXTRAS		= README Makefile.in \
-		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
+		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam.in \
 		  xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
 		  screensaver-properties.desktop.in \
 		  .gdbinit
@@ -414,8 +414,8 @@ uninstall-man:
 	       rm -f $(install_prefix)$(manNdir)/$$instname* ;		\
 	done
 
-install-pam:
-	@src="$(srcdir)/xscreensaver.pam" ;				\
+install-pam: xscreensaver.pam
+	@src="xscreensaver.pam" ;				\
 	dest=`sed -n 's/.*PAM_SERVICE_NAME[ 	]*"\([^"]*\)".*$$/\1/p'	\
 	   < ../config.h` ;						\
 	dir="$(install_prefix)$(PAM_DIR)" ;				\
@@ -673,11 +673,13 @@ update_ad_version::
   files="XScreenSaver.ad.in ../hacks/config/README ../OSX/bindist.rtf" ;    \
   U=$(UTILS_SRC)/version.h ;						    \
   V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ;		    \
+  Y=`date '+%Y'` ;							    \
   D=`date '+%d-%b-%Y'` ;						    \
   for S in $$files ; do							    \
     T=/tmp/xs.$$$$ ;							    \
     sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*[ab]*[0-9]*\(.*\)/\1$$V\2/"  \
         -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/"	    \
+        -e "s/\( [0-9][0-9][0-9][0-9]-\)[0-9][0-9][0-9][0-9] /\1$$Y /"	    \
       < $$S > $$T ;							    \
     if cmp -s $$S $$T ; then						    \
       true ;								    \
@@ -730,8 +732,7 @@ $(UTILS_BIN)/yarandom.o:	$(UTILS_SRC)/yarandom.c
 $(UTILS_BIN)/colorbars.o:	$(UTILS_SRC)/colorbars.c
 
 $(SAVER_UTIL_OBJS):
-	cd $(UTILS_BIN) ; \
-	$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	$(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 # How we build object files in this directory.
 .c.o:
@@ -922,6 +923,7 @@ prefs.o: ../config.h
 prefs.o: $(srcdir)/prefs.h
 prefs.o: $(srcdir)/types.h
 prefs.o: $(UTILS_SRC)/resources.h
+prefs.o: $(UTILS_SRC)/version.h
 remote.o: ../config.h
 remote.o: $(srcdir)/remote.h
 screens.o: ../config.h