X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=10d57c1a12ef0e0e288e173b2e6e5ff681ac6811;hp=9a97ce82ff638a33d6f953e6ba6c3dfc9229335b;hb=4759fd3d2ee5758c45be960b1dadc71e2e16a555;hpb=d69c3bf75074252359d168ab52e9669621ba5b7c diff --git a/GNUmakefile.in b/GNUmakefile.in index 9a97ce82..10d57c1a 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.57 2002/04/04 00:36:36 gliptak Exp $ +# $Id: GNUmakefile.in,v 1.86 2002/04/15 04:30:27 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -55,7 +55,7 @@ DEST = @prefix@ CONFDEST = @prefix@@sysconfdir@ SBIN_DEST = @prefix@@sbindir@ MAN_DEST = @prefix@@mandir@ - +DOK_WEB_USEM=doc/webserver/user-manual ############################################################################# # Build tools @@ -80,13 +80,15 @@ MV = mv TAR = tar LN = ln WDUMP = @WDUMP@ -dump +JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ -DB = $(JADEBIN) -t sgml -ihtml -D.. -d ldpOK.dsl\#html +DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldpOK.dsl\#html DB2HTML = @DB2HTML@ DKPREFIX = @DKPREFIX@ MAN2HTML = @MAN2HTML@ G2H_CMD = groff -mandoc -Thtml TARGET_OS = @host@ +PERL = perl #User Group paras USER = @USER@ @@ -99,7 +101,7 @@ GROUP = @GROUP@ # - Jon #DOSFILTER = $(SED) -e $$'s,$$,\r,' #DOSFILTER = gawk -v ORS='\r\n' '{print $0;}' -DOSFILTER = perl -p -e 's/\n/\r\n/' +DOSFILTER = $(PERL) -p -e 's/\n/\r\n/' ############################################################################# # Setup for make distribution rh and suse for now @@ -121,7 +123,10 @@ CONFIG_FILES = config trust \ `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` DOC_FILES = AUTHORS LICENSE README ChangeLog \ - `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` privoxy.1 + `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` \ + `find doc/webserver/ -name "*.html"` \ + `find doc/webserver/ -name "*.css"` \ + privoxy.1 ############################################################################# # Filenames and libraries @@ -239,10 +244,35 @@ trust.txt: trust re_filterfile.txt: re_filterfile $(DOSFILTER) < $< > $@ + +############################################################################# +# Pre-dist check: +############################################################################# +dist-check: + @if [ -d CVS ]; then \ + $(ECHO) "***************************************************"; \ + $(ECHO) "*** ***"; \ + $(ECHO) "*** WARNING ***"; \ + $(ECHO) "*** ***"; \ + $(ECHO) "*** The presence of a CVS subdirectory suggests ***"; \ + $(ECHO) "*** that you are trying to build a distribution ***"; \ + $(ECHO) "*** package based on a checked out, not an ***"; \ + $(ECHO) "*** exported copy of the source tree. Please ***"; \ + $(ECHO) "*** see \"Releasing a new version\" in the ***"; \ + $(ECHO) "*** developer manual. ***"; \ + $(ECHO) "*** ***"; \ + $(ECHO) "***************************************************"; \ + $(ECHO) "Type \"yes i am sure\" if you are sure that you"; \ + $(ECHO) -n "really want to proceed: "; \ + read answer; \ + if [ "$$answer" != "yes i am sure" ]; then exit 1; fi \ + fi; + + ############################################################################# # RPM specifice stuff (SuSE or Redhat, ..) ############################################################################# -rpm-stuff: clean clobber +rpm-stuff: dist-check clean clobber for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ if [ ! -w $(RPM_BASE)/$$dir ]; then \ $(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \ @@ -266,7 +296,7 @@ redhat-dist: rpm-stuff exit 1;\ fi - $(TAR) --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) . + $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) . $(RPM) --clean -ta $(TAR_ARCH) if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi @@ -296,7 +326,7 @@ suse-dist: rpm-stuff exit 1;\ fi - $(TAR) --exclude "CVS" --exclude "privoxy-rh.spec" -czf $(TAR_ARCH) . + $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" -czf $(TAR_ARCH) . $(RPM) --clean -ta $(TAR_ARCH) if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi @@ -335,7 +365,7 @@ suse-clean: ############################################################################# # generic distribution ############################################################################# -gen-dist: +gen-dist: dist-check @$(ECHO) "" @$(ECHO) "You have run autoconf && autoheader && ./configure right?" @$(ECHO) "" @@ -434,44 +464,35 @@ win-dist: ############################################################################# -# Tarball distribution. Only source files. No binaries. +# Tarball distribution: No CVS dirs, dotfiles, debian build dir, +# (FIXME:) only parts of the static / generated docs mix in doc/webserver ############################################################################# -tarball-dist: clean clobber + +tarball-dist: dist-check clean clobber $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) -# add source files - for foo in `find . -name ".*\.c"`; do \ - (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ - done; -# add header files - for foo in `find . -name ".*\.h"`; do \ - (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ - done; -# add misc files - for foo in configure.in GNUMakefile.in ; do \ - (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ - done; -# add documentation - for foo in $(DOC_FILES); do \ - (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ - done; + + for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \ + -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" \)`; do \ + files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ + done && \ + cd .. && $(TAR) cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ + # and zip the archive - $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) - $(GZIP_PROG) ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar + $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) + $(GZIP_PROG) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar @$(ECHO) Tarball distribution created. - # anonymously ncftps the tarball to sourceforge tarball-upload: - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz + 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) ... and release the files. @$(ECHO) ------------------------------------------------------- -# handle with care tarball-clean: - $(RM) privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz + $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz ############################################################################# # @@ -491,100 +512,143 @@ doc/source/ldpOK.dsl: # Otherwise we get plain groff conversion. groff2html: - $(G2H_CMD) ./privoxy.1 > doc/webserver/man-page/privoxy-man-page.html + $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html -## developer manual +# developer manual dok-devel: doc/source/ldpOK.dsl - mkdir -p doc/text - rm -rf doc/webserver/developer-manual - cd doc/source && $(DB2HTML) -s ldpOK.dsl developer-manual.sgml && mv developer-manual ../webserver - cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual + rm -f doc/webserver/developer-manual/*.html + rm -rf doc/source/developer-manual + mkdir -p doc/text 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 && $(WDUMP) tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual -## user manual +# user manual dok-user: doc/source/ldpOK.dsl - mkdir -p doc/text - rm -rf doc/webserver/user-manual - cd doc/source && $(DB2HTML) -s ldpOK.dsl user-manual.sgml && mv user-manual ../webserver - cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual + rm -f doc/webserver/user-manual/*.html + rm -rf doc/source/user-manual/ + mkdir -p doc/text doc/source/user-manual + cd doc/source/user-manual && $(DB) ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/ + cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual -## faq +# faq dok-faq: doc/source/ldpOK.dsl - mkdir -p doc/text - rm -rf doc/webserver/faq - cd doc/source && $(DB2HTML) -s ldpOK.dsl faq.sgml && mv faq ../webserver - cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq + rm -f doc/webserver/faq/*.html + rm -rf doc/source/faq + mkdir -p doc/text 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 && $(WDUMP) tmp.html > ../text/faq.txt && rm -rf tmp.html faq -## man page +# man page dok-man: doc/source/ldpOK.dsl - mkdir -p doc/man - mkdir -p doc/webserver/man-page - if [ "$(MAN2HTML)" != "false" ]; then \ - $(ECHO) "Privoxy|Doc/Man page

NAME

" > doc/webserver/man-page/privoxy-man-page.html; \ - man ./privoxy.1 | $(MAN2HTML) -bare \ - >> doc/webserver/man-page/privoxy-man-page.html; \ - $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html; \ - else \ - $(MAKE) groff2html; \ - fi - -readme: doc/source/ldpOK.dsl - cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks readme.sgml > tmp.html &&\ - lynx -dump tmp.html > ../../README && rm -rf tmp.html - # kludge to force recreation on next run. Rodgrigo? - @rm -f doc/source/ldpOK.dsl - -dok: dok-devel dok-user dok-faq dok-man readme -## kludge to force recreation on next run. Rodgrigo? + rm -f doc/man/* doc/webserver/man-page/*.html +ifneq ($(MAN2HTML),false) + $(ECHO) "Privoxy Man page

NAME

" > doc/webserver/man-page/privoxy-man-page.html + man ./privoxy.1 | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html + $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html +else + $(MAKE) groff2html +endif + +# readme page +dok-readme: doc/source/ldpOK.dsl + cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html &&\ + $(WDUMP) tmp.html > ../../README && rm -rf tmp.html + +# webserver files +dok-webserver: doc/source/ldpOK.dsl + cd doc/source/webserver && $(DB) -V nochunks index.sgml > ../../webserver/index.html + $(PERL) -pi.bak -e 's/..\/p_doc.css/p_web.css/;\ + s/<\/HEAD/\n<\/HEAD/;\ + s/<\/HEAD/\n<\/HEAD/'\ + doc/webserver/index.html && rm -f doc/source/webserver/*.bak + +# Main documentation target. +dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver authors +# kludge to force recreation on next run. Rodgrigo? @rm -f doc/source/ldpOK.dsl @$(ECHO) Documentation created. # -# an alternative to the above dok -# -redhat-dok: doc/source/ldpOK.dsl man2html - mkdir -p doc/text doc/man doc/source/user-manual \ - doc/source/developer-manual doc/source/faq -## user manual - rm -rf doc/webserver/user-manual - cd doc/source/user-manual && $(DB) ../user-manual.sgml && cd .. &&\ - mv user-manual ../webserver - cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && \ - $(WDUMP) tmp.html > ../text/user-manual.txt && rm -rf tmp.html \ - user-manual -## developer manual - rm -rf doc/webserver/developer-manual - cd doc/source/developer-manual && $(DB) ../developer-manual.sgml &&\ - cd .. && mv developer-manual ../webserver - cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && \ - $(WDUMP) tmp.html > ../text/developer-manual.txt && rm -rf tmp.html \ - developer-manual -## faq - rm -rf doc/webserver/faq - cd doc/source/faq && $(DB) ../faq.sgml && cd .. && mv faq ../webserver - cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) \ - tmp.html > ../text/faq.txt && rm -rf tmp.html faq -## readme - $(MAKE) redhat-readme +# an alternative to the above dok. disabled man page creation for the moment +# +redhat-dok: dok-release dok-devel dok-user dok-faq redhat-readme dok-webserver authors # kludge to force recreation on next run. Rodgrigo? @rm -f doc/source/ldpOK.dsl + @$(ECHO) Documentation created. # For those with man2html ala RH7's. man2html: mkdir -p doc/webserver/man-page - if [ "$(MAN2HTML)" != "false" ]; then \ - $(MAN2HTML) privoxy.1 |grep -v "^Content-type" > doc/webserver/man-page/privoxy-man-page.html; \ - perl -pi -e 's///; s//man2html/' doc/webserver/man-page/privoxy-man-page.html; \ - else \ - $(MAKE) groff2html; \ - fi +ifneq ($(MAN2HTML),false) + $(MAN2HTML) privoxy.1 |grep -v "^Content-type" > tmp.html + $(PERL) -pi.bak -e 's///; s//man2html/' tmp.html + $(PERL) -pi.bak -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html +# Get rid of spurious  from conversion. (How to do this with perl?) + $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && rm -f tmp.* +else + $(MAKE) groff2html +endif ## Make README redhat-readme: doc/source/ldpOK.dsl cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \ - tmp.html > ../../README && rm -rf tmp.html - # kludge to force recreation on next run. Rodgrigo? + tmp.html > ../../README && rm -rf tmp.html + # kludge to force recreation on next run. Rodgrigo? + @rm -f doc/source/ldpOK.dsl + +## Make AUTHORS file +authors: doc/source/ldpOK.dsl + cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \ + tmp.html > ../../AUTHORS && rm -f tmp.html + # kludge to force recreation on next run. Rodgrigo? @rm -f doc/source/ldpOK.dsl +# make a man page, and then (lousy) HTML version. +# Requires docbook2man (short perl script), see comments +# in privoxy-man-page.sgml. This target is not invoked from other dok targets. +# It is built separately due to dependencies on perl scripts. +man: doc/source/ldpOK.dsl + mkdir -p doc/source/man + cd doc/source/man && docbook2man ../privoxy-man-page.sgml &&\ + perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.1 + cd doc/source/man && $(DB) ../privoxy-man-page.sgml &&\ + mv -f index.html privoxy-man-page.html + # This html is not used. See make man2html. + mv -f doc/source/man/privoxy.1 privoxy.1 + $(MAKE) man2html + # kludge to force recreation on next run. Rodgrigo? + @rm -fr doc/source/ldpOK.dsl doc/source/man + +# Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content +# exceptions accordingly. This needs to go before any doc building (doh). +dok-release: + @$(ECHO) Setting doc version and status to $(VERSION), $(CODE_STATUS) + @$(PERL) -pi.bak -e 's///;\ + s///' \ + doc/source/*sgml doc/source/*/*sgml + rm -fr doc/source/*bak doc/source/*/*bak +ifeq ($(CODE_STATUS),stable) + @$(ECHO) Setting docs to stable $(VERSION) + @$(PERL) -pi.bak -e 's///;\ + s///' \ + doc/source/*sgml doc/source/*/*sgml + rm -fr doc/source/*bak doc/source/*/*bak +else + @$(ECHO) Setting docs to not stable $(VERSION) + @$(PERL) -pi.bak -e 's///;\ + s///' \ + doc/source/*sgml doc/source/*/*sgml + rm -fr doc/source/*bak doc/source/*/*bak +endif + +dok-pdf: doc/source/ldpOK.dsl dok-release + cp doc/source/*.sgml doc/pdf + cp doc/source/*.dsl doc/pdf + cd doc/pdf && db2pdf --pdf -s ldpOK.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf + cd doc/pdf && db2pdf --pdf -s ldpOK.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf + cd doc/pdf && db2pdf --pdf -s ldpOK.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf + rm -f doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux + ############################################################################# # # Webserver @@ -592,22 +656,34 @@ redhat-readme: doc/source/ldpOK.dsl # moves dokumentation to webserver # ############################################################################# -webserver: +webserver: tidy @$(ECHO) ------------------------------------------------------- @$(ECHO) You have run make dok/redhat-dok before, right? @$(ECHO) Note that this command scps all stuff to the webserver, @$(ECHO) it will not remove obsolete documents. @$(ECHO) ------------------------------------------------------- - cd doc/webserver && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - @$(ECHO) Fixing permissions - @ssh ijbswa.sourceforge.net chmod -R g+rw /home/groups/i/ij/ijbswa/htdocs/ 2> /dev/null -webquick: - cd doc/webserver/actions && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/actions + @$(ECHO) Uploading + @cd doc/webserver; \ + 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) Fixing permissions - @ssh ijbswa.sourceforge.net chmod -R g+rw /home/groups/i/ij/ijbswa/htdocs/actions 2> /dev/null + @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' + @ssh ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null; true' +web-actions: tidy + @$(ECHO) Uploading + @cd doc/webserver/actions; \ + 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/actions; tar xvm' + + @$(ECHO) Fixing permissions + @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null' + @ssh ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null' + ############################################################################# # Source file dependencies ############################################################################# @@ -673,10 +749,15 @@ $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) clean: - $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) `find . -iname TAGS` + $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) `find . -name TAGS -o -name tags` + +tidy: + $(RM) `find . -name "*~"` +# $(RM) `find . -name "#*#"` # what is this for?? + $(RM) `find . -name ".\#*"` -clobber: - $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *~ *.tar.gz *.tar \#*\# +clobber: tidy + $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *.tar.gz *.tar # # FIXME: What is all this? # @@ -696,11 +777,11 @@ install: all $(STRIP_PROG) $(PROGRAM) $(INSTALL) $(INSTALL_D) $(SBIN_DEST) $(INSTALL) $(INSTALL_D) $(DEST)/user-manual - $(INSTALL) $(INSTALL_D) $(DEST)/templates - $(INSTALL) $(INSTALL_D) $(CONFDEST) + $(INSTALL) $(INSTALL_D) $(CONFDEST)/templates + $(INSTALL) $(INSTALL_D) $(DEST)/$(DOK_WEB_USEM) $(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST) - if [ -d "doc/webserver/user-manual" ]; then $(INSTALL) $(INSTALL_T) doc/webserver/user-manual $(DEST); fi - $(INSTALL) $(INSTALL_T) templates/[a-z]* $(DEST)/templates + if [ -d "$(DOK_WEB_USEM)" ]; then $(INSTALL) $(INSTALL_T) $(DOK_WEB_USEM)/[a-z]* $(DEST)/$(DOK_WEB_USEM); fi + $(INSTALL) $(INSTALL_T) templates/[a-z]* $(CONFDEST)/templates $(INSTALL) $(INSTALL_T) config default.action default.filter trust $(CONFDEST) # FIXME $(ECHO) privoxy.logrotate privoxy.monthly privoxy.weekly # FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz @@ -714,6 +795,119 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.86 2002/04/15 04:30:27 hal9 +# Missed two -pi.bak's on perl/cygwin problem. +# +# Revision 1.85 2002/04/14 01:05:34 hal9 +# Revert dok-webserver change for SF logo. +# +# Revision 1.84 2002/04/13 22:43:25 hal9 +# -Fix dok-webserver for SF logo (more perl). +# -Change all perl -pi to perl -pi.bak for Cygwin problem. +# +# Revision 1.83 2002/04/12 09:39:25 oes +# Excluding yet more files from tarball; making dist warning yet more scary +# +# Revision 1.82 2002/04/11 21:07:11 oes +# Excluding more files from tarball build +# +# Revision 1.81 2002/04/11 14:40:27 oes +# Fixed typo -- Thanks, Moritz! +# +# Revision 1.80 2002/04/11 12:50:00 oes +# Fixed tarball-dist target +# +# Revision 1.79 2002/04/11 06:49:28 oes +# webserver target: silenced timestamp warnings resulting from uploading westwards, made permissions fixing independant of screwed local dir permissions, suppress (false alarm) make error if not owner of feedback log +# +# Revision 1.78 2002/04/09 13:37:11 sarantis +# fix tar options typo +# +# Revision 1.77 2002/04/09 13:28:53 swa +# build suse and gen-dist with html docs +# +# Revision 1.76 2002/04/08 22:43:41 oes +# Fix: Include dotfiles in fixing webserver permissions +# +# Revision 1.75 2002/04/08 22:14:59 oes +# Silencing tar warnings in the web* targets +# +# Revision 1.74 2002/04/08 15:22:44 hal9 +# This has finishing touches for dok building. Should be ready to go. +# -The main doc build is now 'make dok', should work on Redhat too. +# -Removed man page from main doc build. It is built separately due to +# perl scripts that most aren't likely to have. +# +# Revision 1.73 2002/04/08 14:03:24 oes +# oes for al: Fix install target +# +# Revision 1.72 2002/04/08 13:42:11 oes +# Added safety check to *-dist targets; fixed permissions for feedback logfile +# +# Revision 1.71 2002/04/07 20:32:03 hal9 +# -Add meta data kludge for make dok-webserver via $(PERL). +# -Add subdirs for 'make dok-release'. +# +# Revision 1.70 2002/04/07 08:59:40 swa +# generated files. do NOT edit. +# fixed directory bug in makefile. +# +# Revision 1.69 2002/04/07 08:10:47 swa +# create some of the webserver docs +# automatically (in particular if +# those docs recycle other documentation +# fragments). Now committed webserver's +# index file. +# +# Revision 1.68 2002/04/07 07:58:11 swa +# create some of the webserver docs +# automatically (in particular if +# those docs recycle other documentation +# fragments) +# +# Revision 1.67 2002/04/07 05:31:42 hal9 +# Add 'dok-release' target: +# -Set doc entities to VERSION and CODE_STATUS during make. +# -Set doc conditional content flags (stable vs non-stable). +# A separate target for the time being but needs to be incorporated into +# dok build at some point. +# -Filter out a spurious ^G from new man page > html converion in man2html. +# +# Revision 1.66 2002/04/06 20:28:21 jongfoster +# Prettifying groff2html. +# Using GNU Make's conditional makefile feature rather than shell "if"s. +# (The shell "if"s were hiding errors) +# "perl" -> "$(PERL)" +# Spaces->tabs in a couple of places. +# +# Revision 1.65 2002/04/06 05:16:39 hal9 +# -Add 'authors' and 'man' targets for AUTHORS and man-page (WIP). +# -Both of these will soon be generated files. +# +# Revision 1.64 2002/04/04 22:14:51 oes +# No longer rely on find honoring -iname +# +# Revision 1.63 2002/04/04 21:06:22 swa +# cosmetics. +# +# Revision 1.62 2002/04/04 20:49:50 swa +# attempt to consolidate the +# different dokbook versions. +# +# Revision 1.61 2002/04/04 19:18:21 swa +# readme was leftover directory. use w3m instead +# of lynx to be consistent among developers. use +# consistent target naming. +# +# Revision 1.60 2002/04/04 12:25:41 oes +# Tidy webserver upload w/o *~ files, CVS dirs and logfiles and with proper dir and file permissions +# +# Revision 1.59 2002/04/04 08:32:45 swa +# wrong name for tarball-dist target. further fixed content of tarball dist +# +# Revision 1.58 2002/04/04 06:32:58 hal9 +# New dok targets for make readme. +# # Revision 1.57 2002/04/04 00:36:36 gliptak # always use pcre for matching #