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

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f1a39486bbb1852b74b0a1e01b1fb0cbd996d014..c310f27ad91f913082c1432e5fd29d22a01c19ba 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
 
@@ -67,6 +63,7 @@ tar:
   's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ;  \
   rm -rf $$NAME ; ln -s . $$NAME ;                                         \
   FILES= ;                                                                 \
+  ADIR=archive/ ;                                                          \
   for subdir in $(SUBDIRS) ; do                                                    \
     d=`pwd` ;                                                              \
     cd $$subdir ;                                                          \
@@ -75,10 +72,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 $$ADIR$$NAME.tar.gz... ;                          \
+  GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz                     \
+    `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;            \
   rm $$NAME
 
 
@@ -131,12 +127,13 @@ 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'`;                                                            \
-  if [ ! -f xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then                            \
-    echo "WARNING: xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";    \
+  D=`date '+%d-%b-%Y'`;                                                            \
+  ADIR=archive/ ;                                                          \
+  if [ ! -f $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then                    \
+   echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";\
   fi ;                                                                     \
-  if [ -f xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then                        \
-    echo "WARNING: xscreensaver-$$MAJOR.$$NEW.tar.gz already exists.";     \
+  if [ -f $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then                \
+    echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz already exists.";\
   fi ;                                                                     \
   echo -n "Bumping $$MAJOR.$$MINOR to $$MAJOR.$$NEW ($$D), ok? ";          \
   read line;                                                               \
@@ -174,13 +171,24 @@ 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 ;                                                           \
-  cp -p xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;                       \
-  rpm --define "USE_GL yes" -ba xscreensaver.spec ;                       \
+  DIR=`pwd`/rpm_build ;                                                           \
+  ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ;                           \
+  ADIR=archive/ ;                                                         \
+  rm -rf $$DIR ;                                                          \
+  mkdir $$DIR ;                                                                   \
+  ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ;        \
+  cp -p $${ADIR}xscreensaver-$$VERS.tar.gz $$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 -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
 
@@ -188,7 +196,8 @@ test-tar::
        @                                                                   \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
   D=xscreensaver-$$VERS ;                                                  \
-  NAME="$$D.tar.gz" ;                                                      \
+  ADIR=archive/ ;                                                          \
+  NAME="$${ADIR}$$D.tar.gz" ;                                              \
   if [ ! -f $$NAME ]; then                                                 \
     echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;        \
     exit 1 ;                                                               \
@@ -201,7 +210,7 @@ test-tar::
    chmod -R u+w $$D ;                                                      \
   fi ;                                                                     \
   rm -rf $$D ;                                                             \
-  zcat $$D.tar.gz | tar -xf - ;                                                    \
+  zcat $${ADIR}$$D.tar.gz | tar -xf - ;                                            \
   cd $$D ;                                                                 \
   chmod -R a-w . ;                                                         \
   chmod u+w . ;                                                                    \
@@ -223,7 +232,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 ) ;                                             \
@@ -237,22 +246,25 @@ www::
   DEST=$$HOME/www/xscreensaver ;                                           \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
   HEAD="xscreensaver-$$VERS" ;                                             \
-  NAME="$$HEAD.tar.gz" ;                                                   \
+  ADIR=archive/ ;                                                          \
+  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.$$$$ ;                                                       \
@@ -271,7 +283,7 @@ www::
   else                                                                     \
     set -x ;                                                               \
   fi ;                                                                     \
-  cvs add -kb $$NAME ;                                                     \
+  cvs add -kb $$BNAME ;                                                            \
   cat $$TMP > download.html ;                                              \
   rm -f $$TMP ;                                                                    \
                                                                            \