# 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.173 2008/06/18 18:28:42 fabiankeil Exp $
#
-# Written by and Copyright (C) 2001 - 2007 the SourceForge
+# Written by and Copyright (C) 2001 - 2008 the SourceForge
# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
USER = @USER@
GROUP = @GROUP@
+datarootdir = @datarootdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
CONF_BASE = @sysconfdir@
RMDIR = rmdir
MKDIR = ./mkinstalldirs
STRIP_PROG = strip
-SED = sed
+SED = sed
GREP = grep
CAT = cat
RPM = rpm
RPMBUILD = rpmbuild
-MV = mv
+MV = mv
TAR = tar
LN = ln
TOUCH = touch
G2H_CMD = groff -mandoc -Thtml
TARGET_OS = @host@
PERL = perl
-DOC_DIR = doc/source
+DOC_DIR = doc/source
DOC_TMP = $(DOC_DIR)/tmp
DOC_STATUS = @DOC_STATUS@
`find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"`
DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \
- `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` \
`find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \
`find doc/webserver/ -name "*.css"` \
- privoxy.1 \
- doc/pdf/*.pdf
+ privoxy.1
#############################################################################
# Filenames and libraries
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
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) -------------------------------------------------------
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) -------------------------------------------------------
for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
-o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \
- -name "PACKAGERS" -o -path "*/pdf/*" \)`; do \
+ -name "PACKAGERS" \)`; do \
files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
done && \
cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
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) -------------------------------------------------------
#
# Documentation
#
-# converts doc/source/*.sgml into html, text, pdf and man pages
+# converts doc/source/*.sgml into html and man pages
#
#############################################################################
dok-devel:
$(RM) doc/webserver/developer-manual/*.html
$(RM) -r doc/source/developer-manual
- mkdir -p doc/text doc/source/developer-manual
+ mkdir -p doc/source/developer-manual
cd doc/source/developer-manual && $(DB) ../developer-manual.sgml && cd .. && cp developer-manual/*.html ../webserver/developer-manual/
- cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && env -u LANG $(WDUMP) tmp.html > ../text/developer-manual.txt && $(RM) -r tmp.html developer-manual
# user manual
dok-user:
$(RM) doc/webserver/user-manual/*.html
$(RM) -r doc/source/user-manual/
- mkdir -p doc/text doc/source/user-manual
+ mkdir -p doc/source/user-manual
cd doc/source/user-manual && $(DB) -iuser-man ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/
# FIXME: temp fix so same stylesheet gets in more than one place so it works
# for all doc set-ups, including the 'user manual' config option in local
# system where it MUST be in same directory as html.
$(PERL) -pi.bak -e 's/<\/head/\n<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"p_doc.css\">\n<\/head/i' doc/webserver/user-manual/*html
- cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > tmp.html && env -u LANG $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual
# faq
dok-faq:
$(RM) doc/webserver/faq/*.html
$(RM) -r doc/source/faq
- mkdir -p doc/text doc/source/faq
+ mkdir -p doc/source/faq
cd doc/source/faq && $(DB) ../faq.sgml && cd .. && cp faq/*.html ../webserver/faq/
- cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && env -u LANG $(WDUMP) tmp.html > ../text/faq.txt && $(RM) -r tmp.html faq
# man page, one variation. Try to use the next target, just 'make man'.
dok-man:
$(RM) -r doc/source/*bak doc/source/*/*bak
endif
-# Generate single page html. Used only for creating pdf docs (ATM).
-# Currently using: See http://www.easysw.com/htmldoc/pdf-o-matic.php.
-# If using this generator, remember U-M has a couple of graphics in
-# a parallel directory.
-#
-dok-shtml: dok-release
- mkdir -p doc/source/temp # this directory not in cvs
- cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > temp/privoxy-user-manual.html
- cd doc/source && $(DB) -V nochunks developer-manual.sgml > temp/privoxy-developer-manual.html
- 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.
-
-# Make pdf docs from single page html. Requires htmldoc, see
-# (http://www.easysw.com/htmldoc/). Note: 1.8.20 has a TOC bug.
-# PDF docs are uploaded to webserver as zip archive.
-dok-pdf: dok-shtml
- @$(ECHO) -n "starting htmldoc version: ";
- if htmldoc --version ; then : ; \
- else $(ECHO) "WARNING: could not get htmldoc version" ; fi
- cd utils/ldp_print && $(RM) *html *bak *jpg *tmp *pdf *zip
- cp -f doc/source/temp/*html doc/webserver/user-manual/*jpg utils/ldp_print
- cd utils/ldp_print ;\
- $(PERL) -pi.bak -e 's/\.\.\/images\///; s/(<\/?)SUB/$$1small/i;\
- s/\.\.\/user-manual\/index\.html/privoxy-user-manual.pdf/;\
- s/\.\.\/developer-manual\/index\.html/privoxy-developer-manual.pdf/;\
- s/\.\.\/faq\/index\.html/privoxy-faq.pdf/' *.html ;\
- for i in developer-manual user-manual faq; do \
- ./ldp_print privoxy-$$i.html ;\
- $(ECHO) DONE: privoxy-$$i.pdf ;\
- done ;\
- $(MV) *.pdf ../../doc/pdf ;\
- $(RM) -r *html *bak *jpg *pdf *zip ../../doc/source/temp
-
# 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
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) "****************************************************"
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 2>&1 | grep -v timestamp'
- @$(ECHO) Uploading pdf
- @cd doc/pdf;\
- zip privoxy-pdf-docs *.pdf ;\
- scp -q privoxy-pdf-docs.zip ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/pdf
-
@$(ECHO) Fixing permissions
@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'
dok-get:
cd /tmp ;\
- $(WGET) http://privoxy.org/docs/$(DOC_FILE) ;\
+ $(WGET) http://www.privoxy.org/docs/$(DOC_FILE) ;\
$(TAR) -zxvf $(DOC_FILE)
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.173 2008/06/18 18:28:42 fabiankeil
+# Remove PDF-related stuff.
+#
+# Revision 1.172 2008/06/17 16:16:08 fabiankeil
+# - Stop building text files nobody cares about.
+# - Update copyright year.
+#
+# Revision 1.171 2008/06/13 15:24:57 fabiankeil
+# Move previously inline'd Perl code for the config-file target
+# into a separate file, have it work with older perl releases,
+# clean it up a bit and fix the "underlining" code.
+#
+# 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.
#
projects / privoxy.git / blobdiff