Added debian-dist and debian-upload targets. Also documented usage.

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8f0524f..5237aae 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.99 2002/05/08 13:42:07 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.105 2002/05/25 22:48:19 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -86,6 +86,9 @@ MAN2HTML   = @MAN2HTML@
 G2H_CMD    = groff -mandoc -Thtml
 TARGET_OS  = @host@
 PERL       = perl
+DOC_DIR         = doc/source
+DOC_TMP    = $(DOC_DIR)/tmp
+
 
 #User Group paras
 USER       = @USER@
@@ -454,9 +457,16 @@ hpux-upload:
 # debian distribution
 #############################################################################
 debian-dist:
-       @$(ECHO) coming soon. 
+       @$(ECHO) Creating Debian package.  Will exist in parent directory.
+       dpkg-buildpackage -rfakeroot -us -uc
 debian-upload:
-       @$(ECHO) coming soon. 
+       ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy_$(shell dpkg-parsechangelog | grep "Version" | sed "s/Version: //")_$(shell dpkg --print-architecture).deb
+       @$(ECHO) -------------------------------------------------------
+       @$(ECHO) Now goto
+       @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+       @$(ECHO) ... and release the files.
+       @$(ECHO) -------------------------------------------------------
+
 
 #############################################################################
 # macosx distribution
@@ -568,14 +578,14 @@ else
 endif
 
 # readme page
-dok-readme: 
-       cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html &&\
+dok-readme:
+       cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
        $(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html
 
 # webserver files
 dok-webserver: 
-       cd doc/source/webserver && $(DB) -V nochunks index.sgml > ../../webserver/index.html
-       $(PERL) -pi.bak -e 's/..\/p_doc.css/p_web.css/;\
+       cd doc/source/webserver && $(DB)-notoc -V nochunks index.sgml > ../../webserver/index.html
+       $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
      s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps consumers reduce unwanted junk email and protect their privacy from direct marketing companies.\"><\/HEAD/;\
        s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
        s/\.\d\. //'\
@@ -671,6 +681,16 @@ dok-pdf2: dok-release
        cd doc/source && $(DB) -V nochunks faq.sgml > temp/privoxy-faq.html
 # one could use html2ps and ps2pdf. well, that does not work. htmlps produces incorrect output.
 
+# Create release announcement in text and html, with short and long versions.
+# This is a standalone target, and must be invoked directly.
+announce: dok-release
+       mkdir -p $(DOC_TMP)
+       cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\
+       mv -f index.html announce.html && $(WDUMP) announce.html > announce.txt
+       cd $(DOC_TMP) && $(DB) announce.sgml &&\
+       mv -f index.html announce-mini.html && $(WDUMP) announce-mini.html > announce-mini.txt &&\
+       mv -f *html *txt ../../.. 
+       rm -fr $(DOC_TMP)
 
 #############################################################################
 #
@@ -812,6 +832,12 @@ install: all
        # FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz
        $(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy
 
+coffee:
+        @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,101,0,109,143,205,13,192,32,8,133,\
+                  239,78,241,110,234,1,28,160,171,152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,143,\
+                  13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,69,253,36,102,81,49,83,236,19,225,171,131,\
+                  214,172,163,73,4,168,123,115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,187,54,220,125,\
+                  193,51,228,11,1,0,0);'|zcat
 
 #############################################################################
 
@@ -820,6 +846,24 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.105  2002/05/25 22:48:19  hal9
+# Add -notoc to README build (per oes's dsl magic).
+#
+# Revision 1.104  2002/05/24 00:03:49  oes
+# Use p_doc.css for the Homepage for consistency
+#
+# Revision 1.103  2002/05/23 23:19:00  oes
+# Use dsl without TOC for the homepage
+#
+# Revision 1.102  2002/05/16 01:20:17  hal9
+# make announce target added.
+#
+# Revision 1.101  2002/05/15 12:28:46  oes
+# Trying to keep Hal happy :)
+#
+# Revision 1.100  2002/05/08 13:48:18  hal9
+# Ooops, that trashed JB v2.0.2 comment. Fixed.
+#
 # Revision 1.99  2002/05/08 13:42:07  hal9
 # This fixes the numbering problem on index.html in contact info section (.1.). Using
 # perl, since its way too convoluted to try to fix proper with docbook.