X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=b57d5a469a0105ebe0fc5854a461ff80c62fcb99;hb=fe4d5dbe374602905c1da222ee87ab3362938e44;hp=2429ec18544d3533cfd45a51d0543ee009e8b48e;hpb=5297737b8b20e250a90b8b27afc8100a0c68e8ff;p=privoxy.git
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2429ec18..b57d5a46 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.103 2002/05/23 23:19:00 oes Exp $
+# $Id: GNUmakefile.in,v 1.108 2002/05/28 03:56:08 hal9 Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
@@ -80,13 +80,15 @@ LN = ln
WDUMP = @WDUMP@ -dump
JADECAT = @JADECAT@
JADEBIN = @JADEBIN@
+# Note: Please make sure that -d ldp.dsl\#html stays the last option to
+# $(JADEBIN), because for some targets "-notoc" will be appended
+# to it (--> "ldp.dsl\#html-notoc").
DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html
-DB2HTML = @DB2HTML@
MAN2HTML = @MAN2HTML@
G2H_CMD = groff -mandoc -Thtml
TARGET_OS = @host@
PERL = perl
-DOC_DIR = doc/source
+DOC_DIR = doc/source
DOC_TMP = $(DOC_DIR)/tmp
@@ -96,7 +98,7 @@ GROUP = @GROUP@
# Program to do LF->CRLF
#
-# The sed version should be the most portable, but it doesn't for for me,
+# The sed version should be the most portable, but it doesn't work for me,
# the other two do. FIXME.
# - Jon
#DOSFILTER = $(SED) -e $$'s,$$,\r,'
@@ -210,7 +212,8 @@ all: $(PROGRAM)
#############################################################################
.PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \
suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \
-install conectiva-spec conectiva-dist conectiva-upload
+install conectiva-spec conectiva-dist conectiva-upload debian-dist \
+debian-upload ensure-wdump ensure-jadebin ensure-dkprefix
#############################################################################
@@ -457,9 +460,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
@@ -535,8 +545,33 @@ tarball-clean:
#
#############################################################################
+# 3 checks to make sure docs will be generated
+ensure-wdump:
+ifeq (@WDUMP@,false)
+ @$(ECHO)
+ @$(ECHO) "Cannot build docs; one of w3m, links, or lynx must be installed."
+ @$(ECHO) "You should install the appropriate package and rerun ./configure"
+ @exit 1
+endif
+
+ensure-jadebin:
+ifeq (@JADEBIN@,false)
+ @$(ECHO)
+ @$(ECHO) "Cannot build docs; one of openjade or jade must be installed"
+ @$(ECHO) "You should install the appropriate package and rerun ./configure"
+ @exit 1
+endif
+
+ensure-dkprefix:
+ifeq (@DKPREFIX@,false)
+ @$(ECHO)
+ @$(ECHO) "Cannot build docs; cannot find docbook-dsssl stylesheets"
+ @$(ECHO) "You should install the appropriate package and rerun ./configure"
+ @exit 1
+endif
+
# developer manual
-dok-devel:
+dok-devel: ensure-dkprefix ensure-jadebin ensure-wdump
$(RM) doc/webserver/developer-manual/*.html
$(RM) -r doc/source/developer-manual
mkdir -p doc/text doc/source/developer-manual
@@ -544,7 +579,7 @@ dok-devel:
cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/developer-manual.txt && $(RM) -r tmp.html developer-manual
# user manual
-dok-user:
+dok-user: ensure-dkprefix ensure-jadebin ensure-wdump
$(RM) doc/webserver/user-manual/*.html
$(RM) -r doc/source/user-manual/
mkdir -p doc/text doc/source/user-manual
@@ -552,7 +587,7 @@ dok-user:
cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual
# faq
-dok-faq:
+dok-faq: ensure-dkprefix ensure-jadebin ensure-wdump
$(RM) doc/webserver/faq/*.html
$(RM) -r doc/source/faq
mkdir -p doc/text doc/source/faq
@@ -571,21 +606,33 @@ else
endif
# readme page
-dok-readme:
- cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html &&\
+dok-readme: ensure-dkprefix ensure-jadebin ensure-wdump
+ cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
$(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html
-# webserver files
+# index.sgml is used to create both the Home Page, and a local index
+# for documentation, etc.
+#
+# index.html for webserver:
dok-webserver:
- cd doc/source/webserver && $(DB)-notoc -V nochunks index.sgml > ../../webserver/index.html
+ cd doc/source/webserver && $(DB)-notoc -ip-homepage -V nochunks index.sgml > ../../webserver/index.html
+ $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
+ s/<\/HEAD/\n<\/HEAD/;\
+ s/<\/HEAD/\n<\/HEAD/;\
+ s/\.\d\. //'\
+ doc/webserver/index.html && $(RM) doc/webserver/*.bak
+
+# privoxy-index.html for local documentation:
+dok-index:
+ cd doc/source/webserver && $(DB)-notoc -ip-index -V nochunks index.sgml > ../../webserver/privoxy-index.html
$(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
s/<\/HEAD/\n<\/HEAD/;\
s/<\/HEAD/\n<\/HEAD/;\
s/\.\d\. //'\
- doc/webserver/index.html && $(RM) doc/source/webserver/*.bak
+ doc/webserver/privoxy-index.html && $(RM) doc/webserver/*.bak
# Main documentation target.
-dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors
+dok: dok-devel dok-release dok-user dok-faq dok-readme dok-webserver dok-authors dok-index
@$(ECHO) Documentation created.
#
@@ -612,12 +659,12 @@ groff2html:
$(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html
## Make README
-redhat-readme:
+redhat-readme: ensure-dkprefix ensure-jadebin ensure-wdump
cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \
tmp.html > ../../README && $(RM) -r tmp.html
## Make AUTHORS file
-dok-authors:
+dok-authors: ensure-dkprefix ensure-jadebin ensure-wdump
cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \
tmp.html > ../../AUTHORS && $(RM) tmp.html
@@ -839,6 +886,24 @@ coffee:
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.108 2002/05/28 03:56:08 hal9
+# make dok-index target for privoxy-index.html. Fix *bak dead soldiers in
+# doc/webserver.
+#
+# Revision 1.107 2002/05/27 23:26:33 mal0rd
+# Made doc-generation configuration automatic.
+# References to DB2HTML were removed, not used.
+# --with-docbook now only needed if in odd path.
+#
+# Revision 1.106 2002/05/26 04:55:11 mal0rd
+# Added debian-dist and debian-upload targets. Also documented usage.
+#
+# 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
#