X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=58ea0c344eacd5148ffb49024a8e26630bb64f23;hb=4cecfc89e5e889c7232693897c06168fb378bd5c;hp=5268e7702ab5c800cb745aa0a755bb99be78582b;hpb=13dbc569cdc6e29019722c0ef9b932a925efbcad;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index 5268e770..58ea0c34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,7 @@ SUBDIRS		= utils driver hacks hacks/glx po
 TARFILES	= README README.VMS README.debugging INSTALL xscreensaver.lsm \
 		  configure configure.in Makefile.in config.h.in \
 		  config.h-vms install-sh setup.com config.guess aclocal.m4 \
-		  config.sub install-sh makevms.com \
+		  config.sub makevms.com \
 		  intltool-merge.in intltool-extract.in intltool-update.in \
 		  xscreensaver.lsm.sh xscreensaver.spec \
 
@@ -62,7 +62,8 @@ tar:
   sh xscreensaver.lsm.sh > xscreensaver.lsm.$$$$ ;			    \
   mv xscreensaver.lsm.$$$$ xscreensaver.lsm ;				    \
   NAME=`sed -n								    \
-  's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ;  \
+  's/[^0-9]*\([0-9]\.[0-9][0-9]*b\?[0-9]*\).*/xscreensaver-\1/p' 	    \
+	utils/version.h` ;						    \
   rm -rf $$NAME ; ln -s . $$NAME ;					    \
   FILES= ;								    \
   ADIR=archive/ ;							    \
@@ -186,9 +187,9 @@ rpm::
   mkdir $$DIR ;								   \
   ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ;	   \
   cp -p $${ADIR}$$TGZ $$DIR/SOURCES/ ;					   \
-  rpm --define "_topdir $$DIR"						   \
-      --define "USE_GL yes"						   \
-      -v -ba xscreensaver.spec ;					   \
+  rpmbuild --define "_topdir $$DIR"					   \
+           --define "USE_GL yes"					   \
+           -v -ba xscreensaver.spec ;					   \
   echo '' ;								   \
   echo 'RPM build complete' ;						   \
   echo '' ;								   \