X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=2ae53cafda62955b2dfc6a692aba0b986097ead3;hb=0d6b320def9180cf907ceaed56b23a972a11b757;hp=e085de53a6fd9cefb244db1a1ad7aa3cc1a14480;hpb=ffd8c0873576a9e3065696a624dce6b766b77062;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index e085de53..2ae53caf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in --- xscreensaver, Copyright (c) 1999-2004 Jamie Zawinski.
+# Makefile.in --- xscreensaver, Copyright (c) 1999-2005 Jamie Zawinski.
 # the `../configure' script generates `Makefile' from this file.
 
 @SET_MAKE@
@@ -7,12 +7,12 @@ VPATH		= @srcdir@
 
 SHELL		= /bin/sh
 SUBDIRS		= utils driver hacks hacks/glx po
-TARFILES	= README README.VMS README.debugging INSTALL xscreensaver.lsm \
+TARFILES	= README README.VMS README.debugging INSTALL \
 		  configure configure.in Makefile.in config.h.in \
 		  config.h-vms install-sh setup.com config.guess aclocal.m4 \
 		  config.sub makevms.com \
 		  intltool-merge.in intltool-extract.in intltool-update.in \
-		  xscreensaver.lsm.sh xscreensaver.spec \
+		  xscreensaver.spec \
 
 TAR		= tar
 
@@ -41,6 +41,8 @@ depend::
 distdepend::
 	@$(MAKE) update_spec_version
 	@$(MAKE_SUBDIR)
+	@cd po ; $(MAKE) generate_potfiles_in
+
 TAGS:: tags
 tags::
 	@$(MAKE_SUBDIR)
@@ -59,10 +61,8 @@ tar::
   rm -f configure ;							    \
   $(MAKE) configure ;							    \
   $(MAKE) distdepend ;							    \
-  sh xscreensaver.lsm.sh > xscreensaver.lsm.$$$$ ;			    \
-  mv xscreensaver.lsm.$$$$ xscreensaver.lsm ;				    \
   NAME=`sed -n								    \
-  's/[^0-9]*\([0-9]\.[0-9][0-9]*b\?[0-9]*\).*/xscreensaver-\1/p' 	    \
+  's/[^0-9]*\([0-9]\.[0-9][0-9]*[0-9]*\).*/xscreensaver-\1/p'		    \
 	utils/version.h` ;						    \
   rm -rf $$NAME ; ln -s . $$NAME ;					    \
   FILES= ;								    \
@@ -90,6 +90,7 @@ tar::
 #
 configure::
 	autoconf
+	autoheader
 	@TMP=configure.$$$$ ;						     \
 	echo "munging configure's --help message..." ;			     \
 	( perl -e '							     \
@@ -100,8 +101,6 @@ configure::
 		s/^(Configuration:)$$/\n$$1\n/m;			     \
 		s/^(Directory and file names:)$$/\n$$1\n/m;		     \
 		s/^  --sbindir=.*\n//m;					     \
-		s/^  --libexecdir.*\n//m;				     \
-		s/^  --datadir.*\n.*\n//m;				     \
 		s/^  --sysconfdir.*\n//m;				     \
 		s/^  --sharedstatedir.*\n.*\n//m;			     \
 		s/^  --localstatedir.*\n//m;				     \
@@ -116,6 +115,8 @@ configure::
  --x-includes=DIR        X include files are in DIR\n \
  --x-libraries=DIR       X library files are in DIR/m; \
 									     \
+		s@mandir=.\$${prefix}/man.@mandir=\\\$${datadir}/man@;       \
+									     \
 		print;'							     \
 	< configure							     \
 	> $$TMP &&							     \
@@ -125,7 +126,7 @@ configure::
 bump-version::
 	@								    \
   SRC=utils/version.h ;							    \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\)\.\([0-9][0-9]*\).*/\1 \2/p' $$SRC` ;	    \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\)\.\([0-9][^. ]*\).*/\1 \2/p' $$SRC` ;	    \
   set - $$VERS ;							    \
   MAJOR="$$1"; MINOR="$$2";						    \
   NEW=`echo $$MINOR + 1 | bc` ;						    \
@@ -162,10 +163,10 @@ tick_version:: bump-version
 update_spec_version::
 	@S=$(srcdir)/xscreensaver.spec ;				    \
 	U=$(srcdir)/utils/version.h ;					    \
-	V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ;		    \
-	echo -n "Updating $$S to \"$$V\"... " ;				    \
+	VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ;	    \
+	echo -n "Updating $$S to \"$$VERS\"... " ;			    \
 	T=/tmp/xs.$$$$ ;						    \
-	sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/"		    \
+	sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$VERS/"		    \
 	  < $$S > $$T ;							    \
 	if cmp -s $$S $$T ; then					    \
 	  echo "unchanged." ;						    \
@@ -177,7 +178,7 @@ update_spec_version::
 
 rpm::
 	@								   \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ; \
   DIR=`pwd`/rpm_build ;							   \
   ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ;			   \
   ADIR=archive/ ;							   \
@@ -207,7 +208,7 @@ rpm::
 
 test-tar::
 	@								    \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ; \
   D=xscreensaver-$$VERS ;						    \
   ADIR=archive/ ;							    \
   NAME="$${ADIR}$$D.tar.gz" ;						    \
@@ -257,7 +258,7 @@ test-tar::
 www::
 	@								    \
   DEST=$$HOME/www/xscreensaver ;					    \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ; \
   HEAD="xscreensaver-$$VERS" ;						    \
   ADIR=archive/ ;							    \
   BNAME="$$HEAD.tar.gz" ;						    \