X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=6fe2ba0ec3e652d872185de6943611853bc4d399;hb=585e1a6717d1dd9b90fbb53acaaae82106354d33;hp=f1a39486bbb1852b74b0a1e01b1fb0cbd996d014;hpb=0ed85ca0e4b0eae40a4f50a51d63f2f41e45373a;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index f1a39486..6fe2ba0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,10 +13,6 @@ TARFILES	= README README.VMS README.debugging INSTALL xscreensaver.lsm \
 		  config.sub makevms.com screenblank.txt \
 		  xscreensaver.lsm.sh xscreensaver.spec
 TAR		= tar
-COMPRESS	= gzip --verbose --best
-COMPRESS_EXT	= gz
-# COMPRESS	= compress
-# COMPRESS_EXT	= Z
 
 MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
 
@@ -75,10 +71,9 @@ tar:
       | sed \"s|^|$$subdir/|g;s| | $$subdir/|g\"			    \
       ` ";								    \
     cd $$d ; done ;							    \
-  echo creating tar file $${NAME}.tar.$(COMPRESS_EXT)... ;		    \
-  $(TAR) -vchf -							    \
-    `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" `	    \
-   | $(COMPRESS) > $${NAME}.tar.$(COMPRESS_EXT) ;			    \
+  echo creating tar file $${NAME}.tar.gz... ;				    \
+  GZIP="-9v" $(TAR) -vchzf $${NAME}.tar.gz				    \
+    `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;	    \
   rm $$NAME
 
 
@@ -131,7 +126,7 @@ bump-version::
   MAJOR="$$1"; MINOR="$$2";						    \
   NEW=`echo $$MINOR + 1 | bc` ;						    \
   NEW=`echo $$NEW | sed 's/^\([0-9]\)$$/0\1/'` ;			    \
-  D=`date '+%d-%b-%y'`;							    \
+  D=`date '+%d-%b-%Y'`;							    \
   if [ ! -f xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then			    \
     echo "WARNING: xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";    \
   fi ;									    \
@@ -174,13 +169,23 @@ update_spec_version::
 rpm::
 	@								   \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
-  DIR=/usr/src/redhat ;							   \
+  DIR=`pwd`/rpm_build ;							   \
+  ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ;			   \
+  rm -rf $$DIR ;							   \
+  mkdir $$DIR ;								   \
+  ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ;	   \
   cp -p xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;			   \
-  rpm --define "USE_GL yes" -ba xscreensaver.spec ;			   \
+  rpm --define "_topdir $$DIR"						   \
+      --define "USE_GL yes"						   \
+      -v -ba xscreensaver.spec ;					   \
+  echo '' ;								   \
+  echo 'RPM build complete' ;						   \
+  echo '' ;								   \
   rm -f $$DIR/xscreensaver-$$VERS.tar.gz ;				   \
   rm -rf $$DIR/BUILD/xscreensaver-$$VERS ;				   \
   mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ;				   \
-  mv $$DIR/RPMS/i386/xscreensaver*-$$VERS-*.rpm . ;			   \
+  mv $$DIR/RPMS/$$ARCH/xscreensaver*-$$VERS-*.rpm . ;			   \
+  rm -rf $$DIR ;							   \
   echo '' ;								   \
   ls -lFG xscreensaver*-$$VERS-*.rpm
 
@@ -223,7 +228,7 @@ test-tar::
   ( cd BIN/lesstif ;							    \
     CC=cc ;								    \
     export CC ;								    \
-    ../../configure --with-motif=/usr/local/lesstif ;			    \
+    ../../configure --with-motif=/usr/local/lesstif --without-gnome ;	    \
     echo --------------------------------------------------------------- ;  \
     ( cd utils; gmake all ) ;						    \
     ( cd driver; gmake all ) ;						    \