http://packetstormsecurity.org/UNIX/admin/xscreensaver-3.31.tar.gz

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5cc087cb64bb3d2100b2fa56dc6dbf220c88bd24..d33dc24b35758fd3776f79e874e66754d418ac15 100644 (file)
--- 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
 
 
@@ -174,13 +169,22 @@ 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 -vba --define "_topdir $$DIR"                                       \
+           --define "USE_GL yes" 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