http://ftp.x.org/contrib/applications/xscreensaver-2.34.tar.gz

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2127292bc0c7d0a1a7acfbaeed2015dd0543fc2e..89d3a43b9f829058d2e205c0674d15350a406115 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,7 @@ tar:
   mv xscreensaver.lsm.$$$$ xscreensaver.lsm ;                              \
   NAME=`sed -n                                                             \
   's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ;  \
-  rm -f $$NAME ; ln -s . $$NAME ;                                          \
+  rm -rf $$NAME ; ln -s . $$NAME ;                                         \
   FILES= ;                                                                 \
   for subdir in $(SUBDIRS) ; do                                                    \
     d=`pwd` ;                                                              \
@@ -151,18 +151,76 @@ bump-version::
   echo "overwrote $$SRC";                                                  \
   ls -lFd $$SRC
 
+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" ;                                                      \
+  if [ ! -f $$NAME ]; then                                                 \
+    echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;        \
+    exit 1 ;                                                               \
+  fi ;                                                                     \
+                                                                           \
+  set -e ;                                                                 \
+  set -x ;                                                                 \
+                                                                           \
+  if [ -d $$D ]; then                                                      \
+   chmod -R u+w $$D ;                                                      \
+  fi ;                                                                     \
+  rm -rf $$D ;                                                             \
+  zcat $$D.tar.gz | tar -xf - ;                                                    \
+  cd $$D ;                                                                 \
+  chmod -R a-w . ;                                                         \
+  chmod u+w . ;                                                                    \
+  mkdir BIN ;                                                              \
+  mkdir BIN/athena ;                                                       \
+  mkdir BIN/motif ;                                                        \
+  mkdir BIN/lesstif ;                                                      \
+  chmod a-w . ;                                                                    \
+                                                                           \
+  ( cd BIN/athena ;                                                        \
+    CC=cc ;                                                                \
+    export CC ;                                                                    \
+    ../../configure --with-athena ;                                        \
+    echo --------------------------------------------------------------- ;  \
+    gmake ;                                                                \
+    echo --------------------------------------------------------------- ); \
+                                                                           \
+  ( cd BIN/motif ;                                                         \
+    CC=cc ;                                                                \
+    export CC ;                                                                    \
+    ../../configure --with-motif=/usr/local/motif ;                        \
+    echo --------------------------------------------------------------- ;  \
+    ( cd utils; gmake ) ;                                                  \
+    ( cd driver; gmake ) ;                                                 \
+    echo --------------------------------------------------------------- ); \
+                                                                           \
+  ( cd BIN/lesstif ;                                                       \
+    CC=cc ;                                                                \
+    export CC ;                                                                    \
+    ../../configure --with-motif=/usr/local/lesstif ;                      \
+    echo --------------------------------------------------------------- ;  \
+    ( cd utils; gmake ) ;                                                  \
+    ( cd driver; gmake ) ;                                                 \
+    echo --------------------------------------------------------------- ); \
+                                                                           \
+  chmod -R u+w . ;                                                         \
+
+
 www::
        @                                                                   \
   DEST=$$HOME/www/xscreensaver ;                                           \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
-  NAME="xscreensaver-$$VERS.tar.gz" ;                                      \
+  HEAD="xscreensaver-$$VERS" ;                                             \
+  NAME="$$HEAD.tar.gz" ;                                                   \
+                                                                           \
   if [ ! -f $$NAME ]; then                                                 \
     echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;        \
     exit 1 ;                                                               \
   fi ;                                                                     \
   if [ -f $$DEST/$$NAME ]; then                                                    \
     echo -n "WARNING: $$DEST/$$NAME already exists!  Overwrite? ";         \
-    read line;                                                     \
+    read line;                                                             \
     if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then                  \
       exit 1 ;                                                                     \
     fi ;                                                                   \
@@ -172,10 +230,9 @@ www::
   cd $$DEST ;                                                              \
                                                                            \
   TMP=/tmp/xd.$$$$ ;                                                       \
-  sed "s/xscreensaver-[0-9]\.[0-9][0-9]\.tar\.gz/$$NAME/g" index.html      \
-    > $$TMP ;                                                              \
+  sed "s/xscreensaver-[0-9]\.[0-9][0-9]*/$$HEAD/g" download.html > $$TMP ;  \
   echo '' ;                                                                \
-  diff -u0 index.html $$TMP ;                                              \
+  diff -u0 download.html $$TMP ;                                           \
   echo '' ;                                                                \
                                                                            \
   OLDEST=`ls xscreensaver*.tar.gz | head -1` ;                             \
@@ -189,6 +246,16 @@ www::
     set -x ;                                                               \
   fi ;                                                                     \
   cvs add -kb $$NAME ;                                                     \
-  cat $$TMP > index.html ;                                                 \
+  cat $$TMP > download.html ;                                              \
   rm -f $$TMP ;                                                                    \
+                                                                           \
+  (cd ..; $(MAKE) xscreensaver/changelog.html );                           \
+  cvs diff -u0 changelog.html ;                                                    \
+                                                                           \
+  echo -n "Ok? ";                                                          \
+  read line;                                                               \
+  if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then                            \
+    exit 1 ;                                                               \
+  fi ;                                                                     \
+                                                                           \
   cvs commit -m "$$VERS"