X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=f1b115591869df31fe6e58c5d2bbdbcce67765d1;hp=ffb63b88acbccfa5405e1abcb645b08f058fab0d;hb=20a28003d9d4f3c5af30eea34423493a8783e518;hpb=938f9321e7dcd7f8481d96a89a145cd33e6a9828 diff --git a/GNUmakefile.in b/GNUmakefile.in index ffb63b88..f1b11559 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.142 2006/08/29 01:46:24 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.146 2006/09/08 23:57:19 hal9 Exp $ # # Written by and Copyright (C) 2001 - 2004 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -678,6 +678,10 @@ dok-user: $(RM) -r doc/source/user-manual/ mkdir -p doc/text 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\n<\/head/i' doc/webserver/user-manual/*html cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual # faq @@ -823,7 +827,7 @@ dok-pdf: dok-shtml 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/images/*jpg utils/ldp_print + 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/;\ @@ -1012,7 +1016,7 @@ $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) clean: - $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action `find . -name TAGS -o -name tags` + $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action `find . -name TAGS -o -name tags` config.base config.tmp tidy: $(RM) `find . -name "*~"` @@ -1021,7 +1025,7 @@ tidy: clobber: tidy $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \ - privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl + privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl config.new $(RM) -r autom4te.cache # @@ -1097,6 +1101,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST) @# Install the DOCS and man page. install-sh only does one file at a time. + @# FIXME: only handles jpegs. -@if [ $(check_doc) = 0 ]; then \ DOC=$(DOC_DEST) ;\ else \ @@ -1111,8 +1116,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(INSTALL) $(INSTALL_T) $$ii $$DOC/$$i;\ done ;\ done ;\ - for i in $(DOK_WEB)/images/*jpg; do \ - $(INSTALL) $(INSTALL_T) $$i $$DOC/images;\ + for i in $(DOK_WEB)/user-manual/*jpg; do \ + $(INSTALL) $(INSTALL_T) $$i $$DOC/user-manual;\ done ;\ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $$DOC/man-page;\ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $$DOC/index.html;\ @@ -1121,6 +1126,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(INSTALL) $(INSTALL_T) README $$DOC;\ $(INSTALL) $(INSTALL_T) ChangeLog $$DOC;\ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC;\ + $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\ fi @# Not all platforms support gzipped man pages. @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 @@ -1133,7 +1139,12 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(MV) config.base config ;\ fi $(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \ - $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated + $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.tmp + -@if [ $(check_doc) = 0 ]; then \ + $(SED) 's+^#\?user-manual .*+user-manual $(DOC_DEST)/user-manual/+' config.tmp >config.updated ;\ + else \ + $(SED) 's+^#\?user-manual .*+user-manual $(prefix)/doc/privoxy/user-manual/+' config.tmp >config.updated ;\ + fi;\ $(MV) config config.base $(MV) config.updated config @@ -1182,7 +1193,11 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T fi ;\ $(ECHO) Installing configuration files to $(CONF_DEST);\ for i in $(CONFIGS); do \ - if [ -s "$(CONF_DEST)/$$i" ] ; then \ + if [ "$$i" == "default.action" ] || [ "$$i" == "default.filter" ] || [ "$$i" == "standard.action" ]; then \ + $(RM) $(CONF_DEST)/$$i ;\ + $(ECHO) Installing fresh $$i;\ + $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\ + elif [ -s "$(CONF_DEST)/$$i" ]; then \ $(ECHO) Installing $$i as $$i.new ;\ $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\ NEW=1;\ @@ -1233,6 +1248,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T else \ $(ECHO) "No init script installed, install it manually if needed" ;\ fi + $(RM) config.base config.tmp @# mmmmm, good. @$(ECHO) "$(PROGRAM_V) installation succeeded!" @$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)" @@ -1345,6 +1361,25 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.146 2006/09/08 23:57:19 hal9 +# User manual images are now user-manual doc directory, and fix make install +# target accordingly. +# +# Revision 1.145 2006/09/08 02:32:00 hal9 +# Various changes to implement building and installing docs to be compatible +# with the new "user-manual" settings in config from Roland. Docbook does not +# seem to like dealing with more than one css file, so workaround that here. +# Change 'make install' so it provides p_doc.css in the user-manual doc +# directory so that functions well, and lastly modify 'make install' so that the +# PATH is automatically set, and the 'user-manual' directive should done during +# the install. +# +# Revision 1.144 2006/09/07 22:53:20 hal9 +# Make sure config sgml build related artifacts are cleaned out. +# +# Revision 1.143 2006/09/02 15:59:40 hal9 +# Add to code status to make install output. +# # Revision 1.142 2006/08/29 01:46:24 hal9 # Add user.filter to $CONFIGS. #