Move previously inline'd Perl code for the config-file target

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 284238c..5d3001c 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.167 2008/05/23 14:39:09 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.170 2008/06/12 16:38:50 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001 - 2007 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -55,6 +55,7 @@ SNAPVERSION   = $(RPM_VERSION)-$(shell date "+%Y%m%d")
 USER         = @USER@
 GROUP     = @GROUP@
 
+datarootdir  = @datarootdir@
 prefix       = @prefix@
 exec_prefix  = @exec_prefix@
 CONF_BASE    = @sysconfdir@
@@ -452,7 +453,7 @@ redhat-upload: check-release
        ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
        @$(ECHO) -------------------------------------------------------
        @$(ECHO) Now goto
-       @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+       @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118
        @$(ECHO) ... and release the files.
        @$(ECHO) -------------------------------------------------------
      # w3m http://sourceforge.net/project/admin/editpackages.php?group_id=11118
@@ -492,7 +493,7 @@ suse-upload: check-release
        ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
        @$(ECHO) -------------------------------------------------------
        @$(ECHO) Now goto
-       @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+       @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118
        @$(ECHO) ... and release the files.
        @$(ECHO) -------------------------------------------------------
 
@@ -547,7 +548,7 @@ gen-upload:
        ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar.gz
        @$(ECHO) -------------------------------------------------------
        @$(ECHO) Now goto
-       @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+       @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118
        @$(ECHO) ... and release the files.
        @$(ECHO) -------------------------------------------------------
 
@@ -643,7 +644,7 @@ tarball-upload:
        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) https://sourceforge.net/project/admin/editpackages.php?group_id=11118
        @$(ECHO) ... and release the files.
        @$(ECHO) -------------------------------------------------------
 
@@ -853,27 +854,7 @@ dok-pdf: dok-shtml
 config-file: dok-release
        cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
        env -u LANG w3m -dump __tmp.html | fmt -w 70 > ../../config.new && $(RM) -r __tmp.*
-       $(PERL) -pi.bak \
-               -e 's/^1\. \@\@TITLE\@\@/     /i;'              \
-               -e '/^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;'         \
-               -e 'my $$hit_header;'                           \
-               -e '$$header_len=0 unless $$hit_header;'        \
-               -e 'if ($$hit_header) {'                        \
-               -e '    print "#  ";'                           \
-               -e '    for ($$i=1; $$i < $$header_len; $$i++)' \
-               -e '            {print "=";}'                   \
-               -e '    print "\n";'                            \
-               -e '};'                                         \
-               -e '$$hit_header=0;'                            \
-               -e '$$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;'\
-               -e '$$header_len = length($$_);'                \
-               -e 's/^/#  /;  /^#  #{12,}/ && s/^#  #/####/;'  \
-               -e 's/^.*$$// if $$hit_option;'                 \
-               -e '$$hit_option=0;'                            \
-               -e 's/^\n//;'                                   \
-               -e 's/^#\s*-{20,}//;'                           \
-               -e 's/ *$$//;'                                  \
-               -e '$$hit_option=1 if s/^#\s+@@//;' config.new
+       $(PERL) -i.bak utils/prepare-configfile.pl config.new
 
        $(RM) *.bak
        @$(ECHO)  "****************************************************"
@@ -947,7 +928,7 @@ dok-put:
 
 dok-get:
        cd /tmp ;\
-       $(WGET) http://privoxy.org/docs/$(DOC_FILE) ;\
+       $(WGET) http://www.privoxy.org/docs/$(DOC_FILE) ;\
        $(TAR) -zxvf $(DOC_FILE)
 
 
@@ -1371,6 +1352,19 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.170  2008/06/12 16:38:50  fabiankeil
+# Add third-level domain to URL in dok-get target.
+#
+# Revision 1.169  2008/06/09 17:28:31  fabiankeil
+# - Recommend https for releasing files.
+# - Fix a warning about datarootdir being ignored.
+#
+# Revision 1.168  2008/05/23 18:03:12  fabiankeil
+# - Shorten meta description inserted in dok-webserver
+#   and dok-index target.
+# - In config-file target, unset LANG for w3m as we
+#   might otherwise end up with multi-byte characters.
+#
 # Revision 1.167  2008/05/23 14:39:09  fabiankeil
 # Silence dok-user complaint about @# not being found.
 #