X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=aa66e317492dfcfc247935ea30a2393d52b3e18c;hb=cccbddbc4140cf9a06d7d95cc5c0ca36eb5d6e28;hp=b7ed67e481c8039aeb86e29f4fb44618f35b7933;hpb=3c58fb6311db49c46f1670922933b27c6ea0c065;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index b7ed67e4..aa66e317 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -174,17 +174,23 @@ rpm::
   DIR=`pwd`/rpm_build ;							   \
   ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ;			   \
   ADIR=archive/ ;							   \
+  TGZ=xscreensaver-$$VERS.tar.gz ;					   \
+  if [ ! -f $${ADIR}$$TGZ ]; then					   \
+    echo "$${ADIR}$$TGZ does not exist!  Did you forget to \`make tar'?" ; \
+    exit 1 ; 								   \
+  fi ;									   \
+  rm -rf /var/tmp/xscreensaver-$$VERS-root ;				   \
   rm -rf $$DIR ;							   \
   mkdir $$DIR ;								   \
   ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ;	   \
-  cp -p $${ADIR}xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;		   \
+  cp -p $${ADIR}$$TGZ $$DIR/SOURCES/ ;					   \
   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 -f $$DIR/$$TGZ ;							   \
   rm -rf $$DIR/BUILD/xscreensaver-$$VERS ;				   \
   mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ;				   \
   mv $$DIR/RPMS/$$ARCH/xscreensaver*-$$VERS-*.rpm . ;			   \
@@ -247,22 +253,24 @@ www::
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
   HEAD="xscreensaver-$$VERS" ;						    \
   ADIR=archive/ ;							    \
-  NAME="$$ADIR$$HEAD.tar.gz" ;						    \
+  BNAME="$$HEAD.tar.gz" ;						    \
+  NAME="$$ADIR$$BNAME" ;						    \
+  DNAME="$$DEST/$$HEAD.tar.gz" ;					    \
 									    \
   if [ ! -f $$NAME ]; then						    \
     echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;	    \
     exit 1 ; 								    \
   fi ;									    \
   chmod a-w $$NAME ;							    \
-  if [ -f $$DEST/$$NAME ]; then						    \
-    echo -n "WARNING: $$DEST/$$NAME already exists!  Overwrite? ";	    \
+  if [ -f $$DNAME ]; then						    \
+    echo -n "WARNING: $$DNAME already exists!  Overwrite? ";		    \
     read line;								    \
     if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then		    \
       exit 1 ; 								    \
     fi ;								    \
   fi ;									    \
-  cp -p $$NAME $$DEST/$$NAME ;						    \
-  chmod u+w $$DEST/$$NAME ;						    \
+  cp -p $$NAME $$DNAME ;						    \
+  chmod u+w $$DNAME ;							    \
   cd $$DEST ;								    \
 									    \
   TMP=/tmp/xd.$$$$ ;							    \
@@ -281,7 +289,7 @@ www::
   else									    \
     set -x ;								    \
   fi ;									    \
-  cvs add -kb $$NAME ;							    \
+  cvs add -kb $$BNAME ;							    \
   cat $$TMP > download.html ;						    \
   rm -f $$TMP ;								    \
 									    \