http://x.cybermirror.org/R5contrib/xscreensaver-1.21.tar.Z

[xscreensaver] / Imakefile

diff --git a/Imakefile b/Imakefile
index baa81b19327958336b4ead133d2587545286a408..fd1901deb4f9c1eef34ac86ee326932c495b1a0a 100644 (file)
--- a/Imakefile
+++ b/Imakefile
@@ -9,6 +9,10 @@
 
        TARFILES = README Imakefile config.h screenblank.txt
             TAR = gnutar
+       COMPRESS = compress
+   COMPRESS_EXT = Z
+#      COMPRESS = gzip --verbose --best
+#  COMPRESS_EXT = gz
 
 all:: utils/Makefile driver/Makefile hacks/Makefile
        cd utils  ; $(MAKE) $@ CC="$(CC)" CCOPTIONS="$(CCOPTIONS)" CDEBUGFLAGS="$(CDEBUGFLAGS)"
@@ -32,13 +36,18 @@ hacks/Makefile: hacks/Imakefile config.h
 # This really makes me sick...
 tar: utils/Makefile driver/Makefile hacks/Makefile
        @NAME=`sed -n                                                       \
-  's/[^0-9]*\([0-9].[0-9]*\).*/xscreensaver-\1/p' utils/version.h` ;       \
+  's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ;  \
   rm -f $$NAME ; ln -s . $$NAME ;                                          \
-  echo creating tar file $${NAME}.tar.Z... ;                               \
-   $(TAR) -vchf - `echo $(TARFILES)                                        \
-   \`cd driver ; make echo_tarfiles | sed 's|^|driver/|g;s| | driver/|g'\`  \
-   \`cd utils  ; make echo_tarfiles | sed 's|^|utils/|g; s| | utils/|g'\`   \
-   \`cd hacks  ; make echo_tarfiles | sed 's|^|hacks/|g; s| | hacks/|g'\`   \
-   | sed "s|^|$$NAME/|g; s| | $$NAME/|g" `                                 \
-   | compress > $${NAME}.tar.Z ;                                           \
+  FILES= ;                                                                 \
+  for subdir in driver utils hacks ; do                                            \
+    cd $$subdir ;                                                          \
+    FILES="$$FILES `make echo_tarfiles                                     \
+      | grep -v '^make\['                                                  \
+      | sed \"s|^|$$subdir/|g;s| | $$subdir/|g\"                           \
+      ` ";                                                                 \
+    cd .. ; 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) ;                          \
   rm $$NAME