Tiny English fix: infos -> info

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 7c6dbba..e126048 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.76 2002/04/08 22:43:41 oes Exp $
+# $Id: GNUmakefile.in,v 1.81 2002/04/11 14:40:27 oes Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -296,7 +296,7 @@ redhat-dist: rpm-stuff
        exit 1;\
        fi
 
-       $(TAR) ---exclude ".cvsignore" -exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) .
+       $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) .
        $(RPM) --clean -ta  $(TAR_ARCH)
        if [ -f $(TAR_ARCH) ]; then  $(RM) $(TAR_ARCH); fi
 
@@ -467,47 +467,31 @@ win-dist:
 # Tarball distribution. Only source files. No binaries.
 #############################################################################
 
-MISC_FILES = install-sh config.sub configure.in GNUmakefile.in config.h.in config.guess privoxy*
-
-tarball-dist: dist-check
+tarball-dist: dist-check clean clobber
        $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
-# add source files
-       for foo in `find . -name "*.c"`; do \
-               (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
-       done; 
-# add header files
-       for foo in `find . -name "*.h"`; do \
-               (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
-       done; 
-# add config files
-       for foo in $(CONFIG_FILES); do \
-               (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
-       done; 
-# add misc files
-       for foo in $(MISC_FILES); do \
-               (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
-       done; 
-# add documentation
-       for foo in $(DOC_FILES); do \
-               (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
-       done;
+
+       for i in `find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \
+        -o -name ".cvsignore" -o -path "*/debian/*" \)`; do \
+          files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
+       done &&  \
+       cd .. && $(TAR) cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
+
 # and zip the archive
-       $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
+       $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) 
        $(GZIP_PROG) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar
        @$(ECHO) Tarball distribution created.
 
 # anonymously ncftps the tarball to sourceforge
 tarball-upload:
-       ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
+       ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
        @$(ECHO) -------------------------------------------------------
        @$(ECHO) Now goto
        @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
        @$(ECHO) ... and release the files.
        @$(ECHO) -------------------------------------------------------
 
-# handle with care
 tarball-clean:
-       $(RM) privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
+       $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
 
 #############################################################################
 #
@@ -672,12 +656,13 @@ webserver: tidy
        @$(ECHO) Uploading 
        @cd doc/webserver; \
           upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
-          $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm'
+          $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp'
 
        @$(ECHO) Fixing permissions
-       @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type d | xargs chmod 775 2>/dev/null'
-       @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null'
-       @ssh ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null'
+       @ssh ijbswa.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true'
+       @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null; true'
+       @ssh ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null; true'
+
 
 web-actions: tidy
        @$(ECHO) Uploading 
@@ -800,6 +785,21 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.81  2002/04/11 14:40:27  oes
+# Fixed typo -- Thanks, Moritz!
+#
+# Revision 1.80  2002/04/11 12:50:00  oes
+# Fixed tarball-dist target
+#
+# Revision 1.79  2002/04/11 06:49:28  oes
+# webserver target: silenced timestamp warnings resulting from uploading westwards, made permissions fixing independant of screwed local dir permissions, suppress (false alarm) make error if not owner of feedback log
+#
+# Revision 1.78  2002/04/09 13:37:11  sarantis
+# fix tar options typo
+#
+# Revision 1.77  2002/04/09 13:28:53  swa
+# build suse and gen-dist with html docs
+#
 # Revision 1.76  2002/04/08 22:43:41  oes
 # Fix: Include dotfiles in fixing webserver permissions
 #