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

diff --git a/Makefile.in b/Makefile.in
index 9b19c23d..6fe2ba0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,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