Strip trailing spaces from config-file generation, bug #724596.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b5bfbb2..6734a55 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.104.2.21 2002/11/04 07:04:03 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.104.2.22 2003/03/28 03:32:01 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -865,7 +865,7 @@ config-file: dok-release
                                 s/^/#  /;  /^#  #{12,}/ && s/^#  #/####/;\
                      s/^.*$$// if $$hit_option;\
                      $$hit_option=0;\
-                     s/^\n//;  s/^#\s*-{20,}//;\
+                     s/^\n//;  s/^#\s*-{20,}//; s/ *$$//;\
                      $$hit_option=1 if s/^#\s+@@//;'   config.new
        $(RM) *.bak
        @$(ECHO)  "****************************************************"
@@ -926,6 +926,23 @@ web-actions: tidy
        @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/ -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'
 
+## 
+dok-put:
+       tar --exclude ".cvsignore" --exclude "CVS" --exclude "source" --exclude ".htaccess" \
+            --exclude "obsolete" --exclude "actions" --exclude "*.zip" --exclude "robots.txt"\
+               doc/* INSTALL LICENSE AUTHORS README \
+               -czf $(DOC_FILE) ;\
+               $(ECHO) "Uploading doc package ..." ;\
+               scp $(DOC_FILE) ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/docs/
+               @ssh ijbswa.sourceforge.net 'chmod 775 /home/groups/i/ij/ijbswa/htdocs/docs/*gz 2>/dev/null; true'
+               $(RM) $(DOC_FILE)
+
+dok-get:
+       cd /tmp ;\
+       $(WGET) http://privoxy.org/docs/$(DOC_FILE) ;\
+       $(TAR) -zxvf $(DOC_FILE)
+
+
 #############################################################################
 # Source file dependencies
 #############################################################################
@@ -1323,6 +1340,12 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.104.2.22  2003/03/28 03:32:01  hal9
+# Minor changes for Privoxy home page:
+#  - Handle © more sanely
+#  - include link to announce.txt
+# Also, disable 'make announce' target.
+#
 # Revision 1.104.2.21  2002/11/04 07:04:03  hal9
 # Catch up with main trunk install/uninstall. Quiet output, etc.
 #