X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=a99184a27da0250561160cd4064a57fdd5f25411;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hp=c8e034f336457fe6f1dfa76a0aa278f995d63c24;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index c8e034f3..a99184a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in --- xscreensaver, Copyright (c) 1999-2008 Jamie Zawinski.
+# Makefile.in --- xscreensaver, Copyright (c) 1999-2010 Jamie Zawinski.
 # the `../configure' script generates `Makefile' from this file.
 
 @SET_MAKE@
@@ -6,7 +6,8 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 SHELL		= /bin/sh
-SUBDIRS		= utils driver hacks hacks/glx po
+SUBDIRS 	= utils driver hacks hacks/glx po
+#SUBDIRS 	= utils driver hacks hacks/glx
 SUBDIRS2	= $(SUBDIRS) OSX
 TARFILES	= README README.hacking README.VMS INSTALL \
 		  configure configure.in Makefile.in config.h.in \
@@ -80,6 +81,7 @@ tar::
       ` ";								    \
     cd $$d ; done ;							    \
   echo creating tar file $$ADIR$$NAME.tar.gz... ;			    \
+  export COPYFILE_DISABLE=true ;					    \
   GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz			            \
     `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;	    \
   rm $$NAME
@@ -92,9 +94,14 @@ tar::
 # out options we don't use.  Odds are good that this will fail with any version
 # of autoconf other than the ones I've tried (2.12 and 2.13.)
 #
+# NOTE: we now require autoconf 2.63 or earlier, because later versions have
+# the "Expanded-Before-Required" change and I can't make any sense of it.
+# If someone wants to send me a patch to make configure.in work with 2.64
+# or later, feel free.  Personally, I can't be bothered.
+#
 configure::
-	autoconf
-	autoheader
+	autoconf263
+	autoheader263
 	@TMP=configure.$$$$ ;						     \
 	echo "munging configure's --help message..." ;			     \
 	( perl -e '							     \
@@ -321,7 +328,7 @@ www::
   cd $$DEST ;								    \
 									    \
   TMP=/tmp/xd.$$$$ ;							    \
-  sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ;  \
+  sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ;    \
   echo '' ;								    \
   diff -U0 download.html $$TMP ;					    \
   echo '' ;								    \
@@ -334,10 +341,10 @@ www::
       set -x ;								    \
       rm $$OLDEST ;							    \
       cvs remove $$OLDEST ;						    \
-    else								    \
-      set -x ;								    \
+      set +x ;								    \
     fi ;								    \
   done ;								    \
+  set -x ;								    \
   cvs add -kb $$BNAME $$BNAME2 ;					    \
   cat $$TMP > download.html ;						    \
   rm -f $$TMP ;								    \