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

diff --git a/Makefile.in b/Makefile.in
index c310f27a..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 . ;			   \