X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=1aa43aca9ab206b34c1f8d1f63650c73ad457847;hp=a69592c153ad12538bd2d878d234734d51a12cb7;hb=f4107f65b676b63a199fe4230e58695757f9f199;hpb=24572448e3b0c5b59d0799b04070e0c443456302 diff --git a/GNUmakefile.in b/GNUmakefile.in index a69592c1..1aa43aca 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,8 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.128 2002/10/18 05:36:32 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.159 2008/03/21 11:13:53 fabiankeil Exp $ # -# Written by and Copyright (C) 2001 the SourceForge +# Written by and Copyright (C) 2001 - 2007 the SourceForge # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -48,16 +48,12 @@ SNAPVERSION = $(RPM_VERSION)-$(shell date "+%Y%m%d") ############################################################################# -# Source directories +# "make install" directories and variables ############################################################################# -DIR_PRIVOXY_ROOT := . -DIR_PRIVOXY_SRC := $(DIR_PRIVOXY_ROOT)/src -DIR_PRIVOXY_SRC_PCRE := $(DIR_PRIVOXY_ROOT)/pcre -DIR_PRIVOXY_OBJ := $(DIR_PRIVOXY_ROOT)/obj -############################################################################# -# Directories for "make install" -############################################################################# +#User Group paras +USER = @USER@ +GROUP = @GROUP@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -85,6 +81,24 @@ PIDS_DEST = $(VAR_DEST)/run # used in source dir only, the install goes to $share_dest/doc/privoxy DOK_WEB = doc/webserver/ +# Install usage should be compatible with install-sh. +INSTALL = @INSTALL@ +# Binaries +BIN_MODE = 0755 +# Support files, docs, etc. +RA_MODE = 0664 +# Directory +DIR_MODE = 0755 +# Files daemon writes to. +RWD_MODE = 0660 +INSTALL_P = -m $(BIN_MODE) +INSTALL_T = -m $(RA_MODE) +INSTALL_D = -m $(DIR_MODE) -d +INSTALL_R = -m $(RWD_MODE) + +# install options for superuser install +#INSTALL_S = -g @GROUP@ -o @USER@ + ############################################################################# # Build tools ############################################################################# @@ -93,17 +107,14 @@ PROGRAM = privoxy@EXEEXT@ CC = @CC@ ECHO = echo GZIP_PROG = gzip -INSTALL = @INSTALL@ -INSTALL_P = -m 0755 -INSTALL_T = -m 0644 -INSTALL_D = -m 0755 -d -# install options for superuser install -#INSTALL_S = -g @GROUP@ -o @USER@ + # id -u is not universal. FIXME: need to set from configure. Breaks on # Solaris. #ID = id -u +ID = id LD = @CC@ RM = rm -f +CP = cp -f RMDIR = rmdir MKDIR = ./mkinstalldirs STRIP_PROG = strip @@ -111,6 +122,7 @@ SED = sed GREP = grep CAT = cat RPM = rpm +RPMBUILD = rpmbuild MV = mv TAR = tar LN = ln @@ -118,34 +130,31 @@ TOUCH = touch KILL = kill CHMOD = chmod CHOWN = chown +CHGRP = chgrp +GROUPS = groups WDUMP = @WDUMP@ -dump JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ -DOC_STATUS = @DOC_STATUS@ -# 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) -i$(DOC_STATUS) -ihtml -t sgml -D.. -d ldp.dsl\#html +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 -DKPREFIX = @DKPREFIX@ - -#User Group paras -USER = @USER@ -GROUP = @GROUP@ +DOC_STATUS = @DOC_STATUS@ # Program to do LF->CRLF # -# The sed version should be the most portable, but it doesn't work for me, +# The sed version should be the most portable, but it doesn't for for me, # the other two do. FIXME. # - Jon #DOSFILTER = $(SED) -e $$'s,$$,\r,' #DOSFILTER = gawk -v ORS='\r\n' '{print $0;}' DOSFILTER = $(PERL) -p -e 's/\n/\r\n/' +CVSROOT = :pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa +#TMPDIR := $(shell mktemp -d /tmp/$(PROGRAM).XXXXXX) ############################################################################# # Setup for make distribution rh and suse for now @@ -157,7 +166,7 @@ RPM_BASE = @RPM_BASE@ ############################################################################# # We include these files in our distributions ############################################################################# -CONFIGS = config trust default.action standard.action user.action default.filter +CONFIGS = config trust default.action standard.action user.action default.filter user.filter # take care that no CVS .cvsignore or other crappy files # are included here # and escape every '#' in the find. doh. @@ -168,60 +177,45 @@ 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 + privoxy.1 \ + doc/pdf/*.pdf ############################################################################# # Filenames and libraries ############################################################################# -C_SRC = \ - $(DIR_PRIVOXY_SRC)/actions.c \ - $(DIR_PRIVOXY_SRC)/cgi.c \ - $(DIR_PRIVOXY_SRC)/cgiedit.c \ - $(DIR_PRIVOXY_SRC)/cgisimple.c \ - $(DIR_PRIVOXY_SRC)/deanimate.c \ - $(DIR_PRIVOXY_SRC)/encode.c \ - $(DIR_PRIVOXY_SRC)/errlog.c \ - $(DIR_PRIVOXY_SRC)/filters.c \ - $(DIR_PRIVOXY_SRC)/gateway.c \ - $(DIR_PRIVOXY_SRC)/jbsockets.c \ - $(DIR_PRIVOXY_SRC)/jcc.c \ - $(DIR_PRIVOXY_SRC)/killpopup.c \ - $(DIR_PRIVOXY_SRC)/list.c \ - $(DIR_PRIVOXY_SRC)/loadcfg.c \ - $(DIR_PRIVOXY_SRC)/loaders.c \ - $(DIR_PRIVOXY_SRC)/miscutil.c \ - $(DIR_PRIVOXY_SRC)/parsers.c \ - $(DIR_PRIVOXY_SRC)/ssplit.c \ - $(DIR_PRIVOXY_SRC)/urlmatch.c - -C_OBJS = $(C_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) -C_HDRS = $(C_SRC:.c=.h) $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/actionlist.h - -W32_SRC = @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.c $(DIR_PRIVOXY_SRC)/w32taskbar.c $(DIR_PRIVOXY_SRC)/win32.c -W32_FILES = @WIN_ONLY@$(DIR_PRIVOXY_OBJ)/w32res.res -W32_OBJS = @WIN_ONLY@$(W32_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) $(W32_FILES) -W32_HDRS = @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/w32taskbar.h $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC)/w32res.h +C_SRC = actions.c cgi.c cgiedit.c cgisimple.c deanimate.c encode.c \ + errlog.c filters.c gateway.c jbsockets.c jcc.c \ + list.c loadcfg.c loaders.c miscutil.c parsers.c ssplit.c \ + urlmatch.c + +C_OBJS = $(C_SRC:.c=.@OBJEXT@) +C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h + +W32_SRC = @WIN_ONLY@w32log.c w32taskbar.c win32.c w32svrapi.c +W32_FILES = @WIN_ONLY@w32.res +W32_OBJS = @WIN_ONLY@$(W32_SRC:.c=.@OBJEXT@) $(W32_FILES) +W32_HDRS = @WIN_ONLY@w32log.h w32taskbar.h win32.h w32res.h w32svrapi.h W32_LIB = @WIN_ONLY@-lwsock32 -lcomctl32 W32_INIS = @WIN_ONLY@config.txt trust.txt -PCRS_SRC = @STATIC_PCRS_ONLY@$(DIR_PRIVOXY_SRC)/pcrs.c -PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) +PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c +PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@) PCRS_HDRS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.h) -PCRE_SRC = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/get.c $(DIR_PRIVOXY_SRC_PCRE)/maketables.c $(DIR_PRIVOXY_SRC_PCRE)/study.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.c -PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) -PCRE_HDRS = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/chartables.c $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h +PCRE_SRC = @STATIC_PCRE_ONLY@pcre/get.c pcre/maketables.c pcre/study.c pcre/pcre.c +PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:.c=.@OBJEXT@) +PCRE_HDRS = @STATIC_PCRE_ONLY@pcre/config.h pcre/chartables.c pcre/internal.h pcre/pcre.h # No REGEX (maybe because dynamically linked pcreposix): REGEX_SRC = -@STATIC_PCRE_ONLY@REGEX_SRC = $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.c +@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c -REGEX_OBJS = $(REGEX_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) +REGEX_OBJS = $(REGEX_SRC:.c=.@OBJEXT@) REGEX_HDRS = $(REGEX_SRC:.c=.h) # Dependencies introduced by #include "project.h". -PROJECT_H_DEPS = $(DIR_PRIVOXY_SRC)/project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/pcre.h +PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcre.h # Socket libraries for platforms that need them explicitly defined SOCKET_LIB = @SOCKET_LIB@ @@ -252,7 +246,7 @@ OTHER_CFLAGS = CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ @STATIC_PCRE_ONLY@ -Ipcre -LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) +LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) ############################################################################# @@ -266,24 +260,17 @@ all: $(PROGRAM) default.action ############################################################################# # Phony targets ############################################################################# -.PHONY: all inifiles redhat-dist redhat-upload redhat-test solaris-dist suse-dist \ +.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 debian-dist \ -debian-upload ensure-wdump ensure-jadebin ensure-dkprefix CONF_DEST LOG_DEST \ +install conectiva-spec conectiva-dist conectiva-upload CONF_DEST LOG_DEST \ PID_DEST check_doc install-strip uninstall GROUP_T - ############################################################################# -# Compile command +# Define this explicitly because Solaris is broken! ############################################################################# -$(DIR_PRIVOXY_OBJ)/%.o: $(DIR_PRIVOXY_SRC)/%.c $(DIR_PRIVOXY_OBJ) - $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ - -$(DIR_PRIVOXY_OBJ)/%.o: $(DIR_PRIVOXY_SRC_PCRE)/%.c $(DIR_PRIVOXY_OBJ) +%.o: %.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ -$(DIR_PRIVOXY_OBJ): - $(MKDIR) obj ############################################################################# # Strip master copy comments from default.action: @@ -335,6 +322,7 @@ dist-check: if [ "$$answer" != "yes i am sure" ]; then exit 1; fi \ fi; + ############################################################################# # create tar.gz from CVS: # This make-target is usually called through 'create-archive'. If you @@ -348,8 +336,9 @@ create-snapshot: @tag=`cvs -d $(CVSROOT) status Makefile | awk ' /Sticky Tag/ { print $$3 } '` 2> /dev/null; \ [ x"$$tag" = x"(none)" ] && tag=HEAD; \ echo "*** Creating package from $$tag!"; \ - cd $(TMPDIR) ; cvs -Q -d $(CVSROOT) export -r $$tag current || echo "Um... export aborted." - @cd $(TMPDIR)/current; \ + TMPDIR=$(shell mktemp -d /tmp/$(PROGRAM).XXXXXX); \ + cd $$TMPDIR ; cvs -Q -d $(CVSROOT) export -r $$tag current || echo "Um... export aborted."; \ + cd $$TMPDIR/current; \ TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ -e 's/^\(Release:\).*/\1 $(SNAPVERSION)/g' \ @@ -367,17 +356,12 @@ create-snapshot: $(ECHO) "Could not set version info in specfile."; \ exit 1;\ fi; \ - $(RM) $(TMPFILE); \ - cd $(TMPDIR)/current; \ - $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude \ - "privoxy-suse.spec" -czf $(TMPDIR)/$(PROGRAM)-rh-$(VERSION).tar.gz .; \ - $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude \ - "privoxy-rh.spec" -czf $(TMPDIR)/$(PROGRAM)-suse-$(VERSION).tar.gz . - @$(MV) -f $(TMPDIR)/$(PROGRAM)-rh-$(VERSION).tar.gz . - @$(MV) -f $(TMPDIR)/$(PROGRAM)-suse-$(VERSION).tar.gz . - @$(RM) -rf $(TMPDIR) - @echo "Resulting files are $(PROGRAM)-rh-$(VERSION).tar.gz and" - @echo " $(PROGRAM)-suse-$(VERSION).tar.gz" + $(RM) $$TMPFILE; \ + cd $$TMPDIR/current; \ + $(TAR) --exclude ".cvsignore" --exclude "CVS" \ + -czf /tmp/$(PROGRAM)-$(VERSION).tar.gz .; \ + $(RM) -rf $$TMPDIR + @echo "Resulting file is /tmp/$(PROGRAM)-$(VERSION).tar.gz" ############################################################################# @@ -389,9 +373,8 @@ create-snapshot: create-archive: make SNAPVERSION=$(SNAPVERSION) create-snapshot - ############################################################################# -# RPM specific stuff (SuSE or Redhat, ..) +# RPM specifice stuff (SuSE or Redhat, ..) ############################################################################# rpm-stuff: dist-check clean clobber for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ @@ -439,7 +422,7 @@ conectiva-spec: conectiva-dist: rpm-stuff conectiva-spec $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-rh.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) . - $(RPM) --clean -ta $(TAR_ARCH) + $(RPMBUILD) --clean -ta $(TAR_ARCH) if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi conectiva-upload: check-release @@ -474,6 +457,16 @@ redhat-upload: check-release @$(ECHO) ------------------------------------------------------- # w3m http://sourceforge.net/project/admin/editpackages.php?group_id=11118 + +############################################################################# +# Creates a Red Hat sourcepackage from CVS (not from the current sources +# on disk) +############################################################################# +redhat-srpm: + make create-archive + $(RPMBUILD) -ts --nodeps $(PROGRAM)-$(VERSION).tar.gz + + ############################################################################# # suse distribution. works fine. no need to be root. ############################################################################# @@ -489,7 +482,7 @@ suse-dist: rpm-stuff # fi $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) . - $(RPM) --clean -ta $(TAR_ARCH) + $(RPMBUILD) --clean -ta $(TAR_ARCH) if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi # anonymously ncftps the rpms to sourceforge @@ -524,7 +517,6 @@ suse-clean: $(RM) /usr/sbin/rcprivoxy $(RM) /usr/share/man/man1/privoxy.1.gz - ############################################################################# # generic distribution ############################################################################# @@ -587,16 +579,9 @@ hpux-upload: # debian distribution ############################################################################# debian-dist: - @$(ECHO) Creating Debian package. Will exist in parent directory. - dpkg-buildpackage -rfakeroot -us -uc + @$(ECHO) coming soon. debian-upload: - 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) ------------------------------------------------------- - + @$(ECHO) coming soon. ############################################################################# # macosx distribution @@ -630,10 +615,7 @@ freebsd-clean: gen-clean # Windows distribution ############################################################################# win-dist: - @$(ECHO) RTFM. You shouldn't run configure before making - @$(ECHO) the Windows release, so you need to start again from - @$(ECHO) a clean CVS export. - @false + $(ECHO) Not implemented. ############################################################################# @@ -645,7 +627,8 @@ tarball-dist: dist-check clean clobber $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \ - -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o -name "PACKAGERS" \)`; do \ + -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \ + -name "PACKAGERS" -o -path "*/pdf/*" \)`; do \ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ done && \ cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ @@ -671,13 +654,244 @@ tarball-clean: # # Documentation # -# converts doc/source/*.sgml into html, text and man pages -# -############################################################################# - - -dok: - cd $(DOC_DIR) && $(MAKE) +# converts doc/source/*.sgml into html, text, pdf and man pages +# +############################################################################# + +# developer manual +dok-devel: + $(RM) doc/webserver/developer-manual/*.html + $(RM) -r 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 && 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 + 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 && 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 + 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) 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 + +# Build man page from sgml. This requires the SGMLSpm perl module. +# See CPAN, or your favorite perl repository. This is the preferred +# target for man page generation! +man: dok-release + mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ + nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ + perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.1 ;\ + $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.1 ../../../privoxy.1 + +# For those with man2html ala RH7s. +man2html: + mkdir -p doc/webserver/man-page +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 +# Twice because my version of man2html is pulling in commas and periods in URLs. + $(PERL) -pi.bak -e 's/()/$$1$$2/g' tmp.html + $(PERL) -pi.bak -e 's,\.">,">,g' 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) tmp.* +else + $(MAKE) groff2html +endif + + +# Otherwise we get plain groff conversion. +groff2html: + $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html + + +# readme page and INSTALL file +dok-readme: dok-release + cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\ + env -u LANG $(WDUMP) tmp.html > ../../README ;\ + $(DB)-notoc -V nochunks install.sgml > tmp.html &&\ + env -u LANG $(WDUMP) tmp.html > ../../INSTALL ;\ + $(RM) tmp.* + +# 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 -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\. //;\ + s/__copy/©/'\ + 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\. //;\ + s/__copy/©/' \ + 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-index + @$(ECHO) Documentation created. + +# +# 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 dok-authors + @$(ECHO) Documentation created. + +## Make README +redhat-readme: + cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html && $(WDUMP) \ + tmp.html > ../../README && $(RM) -r tmp.html + +## Make AUTHORS file +dok-authors: + cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && env -u LANG $(WDUMP) \ + tmp.html > ../../AUTHORS && $(RM) tmp.html + +# 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) -r 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) -r 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) -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 +# 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) + +# The main Privoxy config file, generated from sgml sources. +# NOTE: This will require some hand editing. The new file is outputted +# as config.new so that problem sections can be compared to previous +# version. This is hardcored to w3m for html/text conversion. Also, +# requires the shell util 'fmt'. 2007-11-14: note the perl below dies +# with perl 5.8.8. The same code pasted into a free standing script, +# without the makefile-isms, works fine. +config-file: dok-release + cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\ + w3m -dump __tmp.html |fmt -w 70 > ../../config.new && $(RM) -r __tmp.* + $(PERL) -pi.bak -e 's/^1\. \@\@TITLE\@\@/ /i;\ + /^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;\ + my $$hit_header;\ + $$header_len=0 unless $$hit_header;\ + if ($$hit_header) {\ + print "# ";\ + for ($$i=1; $$i < $$header_len; $$i++) {print "=";}\ + print "\n";\ + };\ + my $$hit_header;\ + $$hit_header=0;\ + $$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;\ + $$header_len = length($$_);\ + s/^/# /; /^# #{12,}/ && s/^# #/####/;\ + s/^.*$$// if $$hit_option;\ + $$hit_option=0;\ + s/^\n//; s/^#\s*-{20,}//; s/ *$$//;\ + $$hit_option=1 if s/^#\s+@@//;' config.new + + $(RM) *.bak + @$(ECHO) "****************************************************" + @$(ECHO) "The output file is config.new." + @$(ECHO) "Now -- you need to hand edit the results!!!" + @$(ECHO) "In particular, check the Debug levels, the" + @$(ECHO) "permit-access, forward & socks examples and the" + @$(ECHO) "various user-manual examples, which all" + @$(ECHO) "probably got hammered." + @$(ECHO) "****************************************************" + +# config file, alternate verison using lynx (perl stuff unfinished). Lynx +# does not do so good a job. +config-file-alt: + cd doc/source && $(ECHO) -e ".h2 JUSTIFY\\nJUSTIFY:FALSE" > __tmp.lynx_cfg &&\ + $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\ + lynx -cfg=__tmp.lynx_cfg -width=78 -dump __tmp.html > ../../config.new && $(RM) -r __tmp.* + $(PERL) -pi -e 's/^( )//;\ + s/:$\/:\n/' config.new ############################################################################# # @@ -719,82 +933,92 @@ web-actions: tidy @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' +## +dok-put: + tar --exclude ".cvsignore" --exclude "CVS" --exclude "source" --exclude ".htaccess" \ + --exclude "obsolete" --exclude "actions" --exclude "*.zip" --exclude "robots.txt"\ + doc/* INSTALL LICENSE AUTHORS README \ + -czf $(DOC_FILE) ;\ + $(ECHO) "Uploading doc package ..." ;\ + scp $(DOC_FILE) ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/docs/ + @ssh ijbswa.sourceforge.net 'chmod 775 /home/groups/i/ij/ijbswa/htdocs/docs/*gz 2>/dev/null; true' + $(RM) $(DOC_FILE) + +dok-get: + cd /tmp ;\ + $(WGET) http://privoxy.org/docs/$(DOC_FILE) ;\ + $(TAR) -zxvf $(DOC_FILE) + + ############################################################################# # Source file dependencies ############################################################################# -$(DIR_PRIVOXY_OBJ)/actions.@OBJEXT@: $(DIR_PRIVOXY_SRC)/actions.c $(DIR_PRIVOXY_SRC)/actions.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/actionlist.h -$(DIR_PRIVOXY_OBJ)/cgi.@OBJEXT@: $(DIR_PRIVOXY_SRC)/cgi.c $(DIR_PRIVOXY_SRC)/cgi.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/cgiedit.h $(DIR_PRIVOXY_SRC)/cgisimple.h $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/actions.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/miscutil.h -$(DIR_PRIVOXY_OBJ)/cgiedit.@OBJEXT@: $(DIR_PRIVOXY_SRC)/cgiedit.c $(DIR_PRIVOXY_SRC)/cgiedit.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/cgi.h $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/actions.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/miscutil.h -$(DIR_PRIVOXY_OBJ)/cgisimple.@OBJEXT@: $(DIR_PRIVOXY_SRC)/cgisimple.c $(DIR_PRIVOXY_SRC)/cgisimple.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/cgi.h $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/actions.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/miscutil.h -$(DIR_PRIVOXY_OBJ)/deanimate.@OBJEXT@: $(DIR_PRIVOXY_SRC)/deanimate.c $(DIR_PRIVOXY_SRC)/deanimate.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) -$(DIR_PRIVOXY_OBJ)/encode.@OBJEXT@: $(DIR_PRIVOXY_SRC)/encode.c $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/config.h -$(DIR_PRIVOXY_OBJ)/errlog.@OBJEXT@: $(DIR_PRIVOXY_SRC)/errlog.c $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.h -$(DIR_PRIVOXY_OBJ)/filters.@OBJEXT@: $(DIR_PRIVOXY_SRC)/filters.c $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/parsers.h $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/cgi.h $(DIR_PRIVOXY_SRC)/deanimate.h @WIN_ONLY@$(DIR_PRIVOXY_SRC)/win32.h -$(DIR_PRIVOXY_OBJ)/gateway.@OBJEXT@: $(DIR_PRIVOXY_SRC)/gateway.c $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h -$(DIR_PRIVOXY_OBJ)/jbsockets.@OBJEXT@: $(DIR_PRIVOXY_SRC)/jbsockets.c $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/filters.h -$(DIR_PRIVOXY_OBJ)/jcc.@OBJEXT@: $(DIR_PRIVOXY_SRC)/jcc.c $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/killpopup.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/parsers.h @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC)/cgi.h -$(DIR_PRIVOXY_OBJ)/killpopup.@OBJEXT@: $(DIR_PRIVOXY_SRC)/killpopup.c $(DIR_PRIVOXY_SRC)/killpopup.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h -$(DIR_PRIVOXY_OBJ)/list.@OBJEXT@: $(DIR_PRIVOXY_SRC)/list.c $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/miscutil.h -$(DIR_PRIVOXY_OBJ)/loadcfg.@OBJEXT@: $(DIR_PRIVOXY_SRC)/loadcfg.c $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/killpopup.h $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/parsers.h @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/win32.h -$(DIR_PRIVOXY_OBJ)/loaders.@OBJEXT@: $(DIR_PRIVOXY_SRC)/loaders.c $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/parsers.h $(DIR_PRIVOXY_SRC)/ssplit.h -$(DIR_PRIVOXY_OBJ)/miscutil.@OBJEXT@: $(DIR_PRIVOXY_SRC)/miscutil.c $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/config.h -$(DIR_PRIVOXY_OBJ)/parsers.@OBJEXT@: $(DIR_PRIVOXY_SRC)/parsers.c $(DIR_PRIVOXY_SRC)/parsers.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/ssplit.h -$(DIR_PRIVOXY_OBJ)/ssplit.@OBJEXT@: $(DIR_PRIVOXY_SRC)/ssplit.c $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/miscutil.h -$(DIR_PRIVOXY_OBJ)/urlmatch.@OBJEXT@: $(DIR_PRIVOXY_SRC)/urlmatch.c $(DIR_PRIVOXY_SRC)/urlmatch.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/ssplit.h +actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h jcc.h list.h loaders.h miscutil.h actionlist.h ssplit.h +cgi.@OBJEXT@: cgi.c cgi.h config.h $(PROJECT_H_DEPS) cgiedit.h cgisimple.h jbsockets.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h +cgiedit.@OBJEXT@: cgiedit.c cgiedit.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actionlist.h actions.h errlog.h miscutil.h +cgisimple.@OBJEXT@: cgisimple.c cgisimple.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h +deanimate.@OBJEXT@: deanimate.c deanimate.h config.h $(PROJECT_H_DEPS) +encode.@OBJEXT@: encode.c encode.h config.h +errlog.@OBJEXT@: errlog.c errlog.h config.h $(PROJECT_H_DEPS) @WIN_ONLY@w32log.h +filters.@OBJEXT@: filters.c filters.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jbsockets.h jcc.h loadcfg.h parsers.h ssplit.h cgi.h deanimate.h @WIN_ONLY@win32.h +gateway.@OBJEXT@: gateway.c gateway.h config.h $(PROJECT_H_DEPS) errlog.h jbsockets.h jcc.h loadcfg.h +jbsockets.@OBJEXT@: jbsockets.c jbsockets.h config.h $(PROJECT_H_DEPS) filters.h +jcc.@OBJEXT@: jcc.c jcc.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h loadcfg.h loaders.h miscutil.h parsers.h @WIN_ONLY@w32log.h win32.h w32svrapi.h cgi.h +list.@OBJEXT@: list.c list.h config.h $(PROJECT_H_DEPS) list.h miscutil.h +loadcfg.@OBJEXT@: loadcfg.c loadcfg.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h jcc.h loaders.h miscutil.h parsers.h @WIN_ONLY@w32log.h win32.h +loaders.@OBJEXT@: loaders.c loaders.h config.h $(PROJECT_H_DEPS) errlog.h encode.h filters.h gateway.h jcc.h loadcfg.h miscutil.h parsers.h ssplit.h +miscutil.@OBJEXT@: miscutil.c miscutil.h config.h +parsers.@OBJEXT@: parsers.c parsers.h config.h $(PROJECT_H_DEPS) errlog.h encode.h filters.h jbsockets.h jcc.h loadcfg.h loaders.h miscutil.h ssplit.h +ssplit.@OBJEXT@: ssplit.c ssplit.h config.h miscutil.h +urlmatch.@OBJEXT@: urlmatch.c urlmatch.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h + +# GNU regex +gnu_regex.@OBJEXT@: gnu_regex.c gnu_regex.h config.h # PCRS -$(DIR_PRIVOXY_OBJ)/pcrs.@OBJEXT@: $(DIR_PRIVOXY_SRC)/pcrs.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/config.h +pcrs.@OBJEXT@: pcrs.c pcrs.h config.h pcre/pcre.h # PCRE -$(DIR_PRIVOXY_OBJ)/get.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/get.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h -$(DIR_PRIVOXY_OBJ)/maketables.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/maketables.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h -$(DIR_PRIVOXY_OBJ)/pcre.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/pcre.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/chartables.c -$(DIR_PRIVOXY_OBJ)/pcreposix.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h -$(DIR_PRIVOXY_OBJ)/study.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/study.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h +pcre/get.@OBJEXT@: pcre/get.c pcre/config.h pcre/internal.h pcre/pcre.h +pcre/maketables.@OBJEXT@: pcre/maketables.c pcre/config.h pcre/internal.h pcre/pcre.h +pcre/pcre.@OBJEXT@: pcre/pcre.c pcre/config.h pcre/internal.h pcre/pcre.h pcre/chartables.c +pcre/pcreposix.@OBJEXT@: pcre/pcreposix.c pcre/config.h pcre/internal.h pcre/pcre.h pcre/pcreposix.h +pcre/study.@OBJEXT@: pcre/study.c pcre/config.h pcre/internal.h pcre/pcre.h # An auxiliary program makes the PCRE default character table source -$(DIR_PRIVOXY_SRC_PCRE)/chartables.c: $(DIR_PRIVOXY_OBJ)/dftables@EXEEXT@ - $(DIR_PRIVOXY_SRC_PCRE)/dftables@EXEEXT@ >$(DIR_PRIVOXY_SRC_PCRE)/chartables.c +pcre/chartables.c: pcre/dftables@EXEEXT@ + pcre/dftables@EXEEXT@ >pcre/chartables.c -$(DIR_PRIVOXY_OBJ)/dftables@EXEEXT@: $(DIR_PRIVOXY_SRC_PCRE)/dftables.c $(DIR_PRIVOXY_SRC_PCRE)/maketables.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/config.h - $(CC) -o $(DIR_PRIVOXY_SRC_PCRE)/dftables@EXEEXT@ $(CFLAGS) $(DIR_PRIVOXY_SRC_PCRE)/dftables.c +pcre/dftables@EXEEXT@: pcre/dftables.c pcre/maketables.c pcre/pcre.h pcre/internal.h pcre/config.h + $(CC) -o pcre/dftables@EXEEXT@ $(CFLAGS) pcre/dftables.c # Win32 -$(DIR_PRIVOXY_OBJ)/w32log.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/w32log.c $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/w32taskbar.h $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h -$(DIR_PRIVOXY_OBJ)/win32.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/win32.c $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h -$(DIR_PRIVOXY_OBJ)/w32taskbar.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/w32taskbar.c $(DIR_PRIVOXY_SRC)/w32taskbar.h - -$(DIR_PRIVOXY_OBJ)/w32res.res: $(DIR_PRIVOXY_SRC)/w32res.rc \ - $(DIR_PRIVOXY_SRC)/w32res.h \ - $(DIR_PRIVOXY_SRC)/config.h \ - $(DIR_PRIVOXY_SRC)/icons/ico00001.ico \ - $(DIR_PRIVOXY_SRC)/icons/ico00002.ico \ - $(DIR_PRIVOXY_SRC)/icons/ico00003.ico \ - $(DIR_PRIVOXY_SRC)/icons/ico00004.ico \ - $(DIR_PRIVOXY_SRC)/icons/ico00005.ico \ - $(DIR_PRIVOXY_SRC)/icons/ico00006.ico \ - $(DIR_PRIVOXY_SRC)/icons/ico00007.ico \ - $(DIR_PRIVOXY_SRC)/icons/ico00008.ico \ - $(DIR_PRIVOXY_SRC)/icons/idle.ico \ - $(DIR_PRIVOXY_SRC)/icons/privoxy.ico +w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h w32taskbar.h win32.h +w32taskbar.@OBJEXT@: w32taskbar.c config.h w32log.h w32taskbar.h +win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h win32.h w32svrapi.h + +w32.res: w32.rc w32res.h icons/ico00001.ico icons/ico00002.ico icons/ico00003.ico icons/ico00004.ico icons/ico00005.ico icons/ico00006.ico icons/ico00007.ico icons/ico00008.ico icons/idle.ico icons/privoxy.ico config.h windres -D__MINGW32__=0.2 -O coff -i $< -o $@ # AmigaOS -@AMIGAOS_ONLY@OBJS += $(DIR_PRIVOXY_OBJ)/amiga.@OBJEXT@ +@AMIGAOS_ONLY@OBJS += amiga.o +@AMIGAOS_ONLY@ifeq ($(shell $(CC) -dumpmachine), m68k-amigaos) @AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -m68020 -noixemul -fbaserel -msmall-code @AMIGAOS_ONLY@LDFLAGS += -m68020 -noixemul -fbaserel @AMIGAOS_ONLY@LIBS = -lm /gg/lib/libb/libm020/libnix/swapstack.o -$(DIR_PRIVOXY_OBJ)/amiga.@OBJEXT@: $(DIR_PRIVOXY_SRC)/amiga.c $(DIR_PRIVOXY_SRC)/amiga.h $(DIR_PRIVOXY_SRC)/config.h +@AMIGAOS_ONLY@else +@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -Wextra -D__USE_INLINE__ -D__NO_INTUITION_RJ_MACROS +@AMIGAOS_ONLY@endif +@AMIGAOS_ONLY@amiga.o: amiga.c amiga.h config.h $(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 "*~"` @@ -802,9 +1026,9 @@ tidy: $(RM) `find . -name ".\#*"` clobber: tidy - $(RM) GNUmakefile configure src/config.h.in src/config.h config.cache config.status config.log logfile \ - privoxy.log core *.tar.gz *.tar privoxy-cl.spec $(DOC_DIR)/ldp.dsl \ - $(DOC_DIR)/GNUmakefile + $(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 config.new + $(RM) -r autom4te.cache # # FIXME: What is all this? @@ -855,29 +1079,32 @@ install-strip: # # FIXME: id handling needs help, probably via configure, since 'id -u' is not # universally reliable (eg Solaris). Group handling could be better. -# Perhaps the whole user/group validation should be done here. +# Perhaps the whole user/group validation should be done here, and simplified. +PROGRAM_V = Privoxy $(VERSION) $(CODE_STATUS) install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T - # Quick test for valid USER. - if [ -n "$(USER)" ]; then \ - id $(USER) >/dev/null || exit 1;\ - fi - # Test for valid group. - if [ -n "$(GROUP_T)" ] && [ -n "$(USER)" ] && ! groups $(USER) | $(GREP) "\<$(GROUP_T)\>" >/dev/null; then \ - $(ECHO) Group $(GROUP_T) for User $(USER) is invalid && exit 1 ;\ + @# Quick test for valid USER. + @if [ -n "$(USER)" ]; then \ + $(ID) $(USER) >/dev/null || exit 1;\ fi - - $(ECHO) "Creating directories, and preparing Privoxy installation" - $(CHMOD) 0755 $(MKDIR) - $(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \ + @# Test for valid group. FIXME. USER does not have to belong to GROUP + @# for file ownership purposes. +# if [ -n "$(GROUP_T)" ] && [ -n "$(USER)" ] && ! $(GROUPS) $(USER) | $(GREP) "\<$(GROUP_T)\>" >/dev/null; then \ +# $(ECHO) Group $(GROUP_T) for User $(USER) is invalid && exit 1 ;\ +# fi + + @$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation" + $(CHMOD) $(DIR_MODE) $(MKDIR) + @$(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \ $(LOG_DEST) $(PID_DEST) - # Install the executable binary, strip if invoked as install-strip - test -n "$(STRIP)" &&\ + @# Install the executable binary, strip if invoked as install-strip + @test -n "$(STRIP)" &&\ $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\ $(ECHO) Installing $(PROGRAM) executable to $(SBIN_DEST) $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST) - # Install the DOCS and man page - -if [ $(check_doc) = 0 ]; then \ + @# 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 \ DOC=$(prefix)/doc/privoxy ;\ @@ -891,8 +1118,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;\ @@ -901,89 +1128,107 @@ 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 - $(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 + @# Not all platforms support gzipped man pages. + @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1 - # Change the config file default directories according to the configured ones - $(ECHO) Rewriting config for this installation - if [ -f config.base ] ; then \ + @# Change the config file default directories according to the configured ones + @$(ECHO) Rewriting config for this installation + @if [ -f config.base ] ; then \ $(CAT) config >config~ ;\ $(MV) config.base config ;\ fi - $(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \ - $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated + $(SED) 's+^confdir \.+confdir $(CONF_DEST)+' config | \ + $(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 - # Install the config support files. Test for root install, and abort - # if there is no privoxy user, and no other user was enabled during - # configure. Later, install init script if appropriate. - $(ECHO) Installing templates to $(CONF_DEST)/templates - for i in `find templates -type f`; do \ + @# Install the config support files. Test for root install, and abort + @# if there is no privoxy user, and no other user was enabled during + @# configure. Later, install init script if appropriate. + @$(ECHO) Installing templates to $(CONF_DEST)/templates + @for i in `find templates -type f`; do \ $(INSTALL) $(INSTALL_T) $$i $(CONF_DEST)/templates ;\ done - if [ "`id |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\ + @# FIXME: group/user validation is overly convoluted. + @# If superuser install ... we require a minimum of group ownership + @# of those files the daemon writes to, to be non-root owned. + @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\ if [ x$(USER) = x ] || [ $(USER) = root ]; then \ - if [ "`id privoxy`" ]; then \ - $(ECHO) "Warning: Setting user and group to privoxy";\ - INSTALL_CONF="$(INSTALL_T) -g privoxy -o privoxy" ;\ - USER=privoxy ;\ - GROUP_T=privoxy ;\ + if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \ + if [ "`$(ID) privoxy`" ] && \ + $(GROUPS) privoxy | $(SED) 's/^.*://' |$(GREP) "\" >/dev/null; then \ + $(ECHO) "Warning: Setting group owner to privoxy";\ + GROUP_T=privoxy ;\ + else \ + $(ECHO) "******************************************************************" ;\ + $(ECHO) " WARNING! WARNING! installing config files as root!" ;\ + $(ECHO) " It is strongly recommended to run $(PROGRAM) as a non-root user," ;\ + $(ECHO) " and to install the config files as that user and/or group!" ;\ + $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\ + $(ECHO) "*******************************************************************" ;\ + exit 1 ;\ + fi ;\ else \ - $(ECHO) "******************************************************************" ;\ - $(ECHO) " WARNING! WARNING! installing config files as root!" ;\ - $(ECHO) " It is strongly recommended to run $(PROGRAM) as non-root user," ;\ - $(ECHO) " and to install the config files as that user!" ;\ - $(ECHO) " Please read INSTALL, and create a privoxy user!" ;\ - $(ECHO) "*******************************************************************" ;\ - exit 1 ;\ + GROUP_T=$(GROUP) ;\ fi ;\ + INSTALL_CONF="$(INSTALL_R) -g $$GROUP_T " ;\ else \ $(ECHO) "Superuser install, installing config files as $(USER):$(GROUP_T)" ;\ - INSTALL_CONF="$(INSTALL_T) -o $(USER) -g $(GROUP_T)" ;\ + INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\ + GROUP_T=$(GROUP_T) ;\ fi ;\ else \ if [ ! "`id $(USER)`" = "`id`" ] ;then \ $(ECHO) "** WARNING ** current install user different from configured user!!" ;\ $(ECHO) "Edit may fail." ;\ fi ;\ - INSTALL_CONF="$(INSTALL_T)" ;\ + INSTALL_CONF="$(INSTALL_R)" ;\ 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) $$i $(CONF_DEST)/$$i.new || exit 1;\ + $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\ NEW=1;\ else \ - if test "$$i" = "config" || test "$$i" = "default.filter"; then \ - $(INSTALL) $$i $(CONF_DEST) || exit 1;\ - $(CHMOD) 0640 $(CONF_DEST)/$$i ;\ - else \ - $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\ - fi;\ + $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\ fi ;\ done ;\ if [ -n "$$NEW" ]; then \ - $(CHMOD) 0640 $(CONF_DEST)/*.new || exit 1 ;\ + $(CHMOD) $(RWD_MODE) $(CONF_DEST)/*.new || exit 1 ;\ $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\ fi ;\ - ! test -f $(LOG_DEST)/logfile && $(ECHO) Creating logfiles in $(LOG_DEST) || \ + [ ! -f $(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(LOG_DEST) || \ $(ECHO) Checking logfiles in $(LOG_DEST) ;\ - $(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\ + $(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\ if [ x$$USER != x ]; then \ - $(CHOWN) $$USER:$$GROUP_T $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \ + $(CHOWN) $$USER $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \ $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ fi ;\ - $(CHMOD) 0640 $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\ + if [ x$$GROUP_T != x ]; then \ + $(CHGRP) $$GROUP_T $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \ + $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ + fi ;\ + $(CHMOD) $(RWD_MODE) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\ if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ $(SED) 's+%SBIN_DEST%+$(SBIN_DEST)+' | \ $(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \ - $(SED) 's+%USER%+$$USER+' | \ + $(SED) 's+%USER%+$(USER)+' | \ $(SED) 's+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\ $(INSTALL) $(INSTALL_P) slackware/rc.privoxy /etc/rc.d/ ;\ $(ECHO) "Installing for Slackware." ;\ @@ -996,7 +1241,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(INSTALL) $(INSTALL_P) init.tmp /etc/rc.d/init.d/privoxy && $(RM) init.tmp;\ $(MKDIR) /etc/logrotate.d/ ;\ $(ECHO) "Installing logrotate script to /etc/logrotate.d/" ;\ - $(INSTALL) $(INSTALL_P) privoxy.logrotate /etc/logrotate.d/privoxy ;\ + $(INSTALL) -m 0644 privoxy.logrotate /etc/logrotate.d/privoxy ;\ elif [ -d /etc/init.d ] && [ -w /etc/init.d ] ; then \ $(ECHO) "Installing generic init script to /etc/init.d/privoxy" ;\ $(ECHO) "Please check that the PATHs are correct, and edit if needed." ;\ @@ -1005,75 +1250,92 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T else \ $(ECHO) "No init script installed, install it manually if needed" ;\ fi - # mmmmm, good. - @$(ECHO) "Privoxy installation succeeded!" + $(RM) config.base config.tmp + @# mmmmm, good. + @$(ECHO) "$(PROGRAM_V) installation succeeded!" @$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)" # rmdir is used as a precaution since it will not remove non-empty -# directories. RH creates lock file and pid file. +# directories. RH init script creates lock file and pid file. uninstall: CONF_DEST LOG_DEST PID_DEST check_doc - $(ECHO) Starting Privoxy uninstallation - # KILL privoxy if running - -if [ -f /etc/redhat-release ] && [ -d /etc/rc.d/init.d/ ] && [ -w /etc/rc.d/init.d/ ] ; then \ + @$(ECHO) Starting Privoxy uninstallation + @# KILL privoxy if running + -@if [ -f /etc/redhat-release ] && [ -x /etc/rc.d/init.d/privoxy ]; then \ /etc/rc.d/init.d/privoxy stop >/dev/null 2>/dev/null ;\ chkconfig --del $(PROGRAM) 2>/dev/null;\ fi - -@ test -f $(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ - $(KILL) `$(CAT) $(PID_DEST)/privoxy.pid` - -@ test -f /var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ - $(KILL) `$(CAT) /var/run/privoxy.pid ` + -@test -f $(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ + $(KILL) `$(CAT) $(PID_DEST)/privoxy.pid` || : + -@test -f /var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ + $(KILL) `$(CAT) /var/run/privoxy.pid ` || : - # Program binary - $(ECHO) Removing $(PROGRAM) binary + @# Program binary + @$(ECHO) Removing $(PROGRAM) binary $(RM) $(SBIN_DEST)/$(PROGRAM) $(SBIN_DEST)/$(PROGRAM)~ - # config files and dir, and maybe old install backups - $(ECHO) Removing $(PROGRAM) config files - for i in $(CONFIGS); do \ + @# config files and dir, and maybe old install backups + -@if [ -d $(CONF_DEST) ]; then \ + $(ECHO) Saving $(PROGRAM) config files to /tmp/$(PROGRAM)-save ;\ + $(MKDIR) /tmp/$(PROGRAM)-save ;\ + cd $(CONF_DEST) ;\ + for i in $(CONFIGS); do \ + [ -f $$i ] && $(CP) $$i /tmp/$(PROGRAM)-save ;\ + done ;\ + fi + @$(ECHO) Removing $(PROGRAM) config files + -@for i in $(CONFIGS); do \ + test -f $(CONF_DEST)/$$i && $(ECHO) Removing $$i ;\ $(RM) $(CONF_DEST)/$$i $(CONF_DEST)/$$i~ $(CONF_DEST)/$$i.new ;\ done - $(RM) -r $(CONF_DEST)/templates - - # man page and docs - $(ECHO) Removing $(PROGRAM) docs + -@test -d $(CONF_DEST)/templates && $(RM) -r $(CONF_DEST)/templates &&\ + $(ECHO) "Removing $(CONF_DEST)/templates/*" + + @# man page and docs + @$(ECHO) Removing $(PROGRAM) docs -$(RM) $(MAN_DEST)/privoxy.1* -$(RM) -r $(DOC_DEST) || $(RM) -r $(prefix)/doc/privoxy - # Log and jarfile and pidfile - $(ECHO) Removing $(PROGRAM) logs + @# Log and jarfile and pidfile + @$(ECHO) Removing $(PROGRAM) logs -$(RM) $(LOG_DEST)/logfile $(PID_DEST)/privoxy.pid $(LOG_DEST)/jarfile - # Final clean up of unused directories. Special handling of CONF and LOG + @# Final clean up of unused directories. Special handling of CONF and LOG # destinations. - $(ECHO) Removing $(PROGRAM) directories - for i in $(LOG_DEST) $(CONF_DEST); do \ + @$(ECHO) Removing $(PROGRAM) directories + @for i in $(LOG_DEST) $(CONF_DEST); do \ if test -d $$i; then \ + $(ECHO) Removing $$i ;\ $(RMDIR) $$i || $(ECHO) "$$i is not empty, not removed" ;\ fi;\ done - if [ ! "$(prefix)" = "/usr/local" ] ;then \ + @if [ ! "$(prefix)" = "/usr/local" ] ;then \ for i in $(MAN_DEST) $(MAN_DIR) $(SHARE_DEST)/doc $(SHARE_DEST) $(SBIN_DEST); do \ if test -d $$i; then \ + $(ECHO) Removing $$i ;\ $(RMDIR) $$i || $(ECHO) "$$i is not empty, not removed" ;\ fi;\ done;\ if test $(LOG_DEST) != /var/log/privoxy && test -d $(prefix)/var/log; then \ + $(ECHO) Removing $(prefix)/var/log ;\ $(RMDIR) $(prefix)/var/log || $(ECHO) "$(prefix)/var/log is not empty, not removed";\ fi ;\ if test $(PID_DEST) != /var/run && test -d $(prefix)/var/run; then \ + $(ECHO) Removing $(prefix)/var/run ;\ $(RMDIR) $(prefix)/var/run || $(ECHO) "$(prefix)/var/run is not empty, not removed";\ fi ;\ if test $(prefix)/var != /var && test -d $(prefix)/var; then \ + $(ECHO) Removing $(prefix)/var ;\ $(RMDIR) $(prefix)/var || $(ECHO) "$(prefix)/var is not empty, not removed" ;\ fi ;\ if test $(prefix) != / && test $(prefix) != /usr && test -d $(prefix); then \ + $(ECHO) Removing $(prefix) ;\ $(ECHO) Removing installation directory $(prefix) ;\ $(RMDIR) $(prefix) || $(ECHO) "$(prefix) is not empty, not removed" ;\ fi;\ fi - # init scripts and logrotate - if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ + @# init scripts and logrotate + @if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ $(ECHO) Removing $(PROGRAM) init script ;\ if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ $(RM) /etc/rc.d/rc.privoxy ;\ @@ -1085,7 +1347,7 @@ uninstall: CONF_DEST LOG_DEST PID_DEST check_doc $(ECHO) "Unable to remove privoxy init script, not installed or permission denied" ;\ fi ;\ fi - $(ECHO) Privoxy uninstalled, bye + @$(ECHO) Privoxy uninstalled, bye 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,\ @@ -1101,126 +1363,192 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ -# Revision 1.128 2002/10/18 05:36:32 hal9 -# More install target fixes: -# - Quick fix of log ownership on root install (lightly tested). If this goes -# true to form, then the fix will break something else :( -# - Fix what looks like was invalid user on Slack if root install and -# we use an existing privoxy user. No way to test this. -# See FIXMEs. -# -# Revision 1.127 2002/10/18 00:58:07 hal9 -# More install/uninstall/install-strip updates: -# - Don't install gzipped man page (Solaris again). -# - Don't overwrite existing config files, and install new versions as *.new. -# Fix permissions/ownership here too. -# - Better testing before removing directories. -# - Some better messages during install, ie 'Preserving configs', etc. -# - Better handling of install-strip to fix previous problem of trying to strip -# init scripts. -# - Crude test for valid USER in case is set on command line. -# - Force immediate exit on some errors (eg invalid group). -# -# Revision 1.126 2002/10/16 05:38:00 hal9 -# More make install/uninstall updates: -# -Make compatible with install-sh with does not support -b flag, and can only -# handle one file at a time (sigh). -# -Manually save existing config files, if they exist. -# -Fix install-strip so does not try to strip init scripts. -# -# Revision 1.125 2002/10/15 05:53:34 hal9 -# A few more cleanups: -# -use mkinstalldirs consistently. -# -Install init script and logrotate only is prefix=/usr/local (installed to -# system dir /etc instead of /usr/local...) -# -Test for directory existence before removing to avoid misleading error -# messages. -# -# Revision 1.124 2002/10/13 19:58:09 hal9 -# Hopefully, this is final updates for install and uninstall targets. -# - Fix typo in chown syntax -# - chmod on mkinstalldirs to make it executable (is there a better way?). -# - Cleanup comments, and revert most of previous output cleanup changes. -# - Include all HTML docs, since there are cross links between these. -# - Improved group handling (still some potential problems, see FIXME). -# - Update PHONY targets. -# - Uninstall was not removing CONF and LOG destinations in some situations. -# - Various other minor cleanups. -# -# Revision 1.123 2002/10/12 06:05:41 hal9 -# WIP: This is mostly to fix various problems encountered on SF CF Solaris -# servers for the install target only. This did not handle /[^C]*, test -e, not -# quoting within tests (ie [ `id $(USER)` = `id` ] needs quoting) in some -# situations, and does not support id -u (with the id in $PATH, but there is -# another...). Also, cleaned up output. Needs testing. I am unable to test the -# root install stuff either. It installs now at least (not tested further). -# A few other nits. -# -# Revision 1.122 2002/10/11 06:03:08 hal9 -# Really install FAQ this time, and not u-m in two locations. Include images -# for u-m. -# -# Revision 1.120 2002/10/10 20:39:27 dessent -# -# -# Fixes for Win32 GUI build (added "$(DIR_PRIVOXY_SRC)/" to dependencies list) -# -# Revision 1.119 2002/09/23 03:42:41 hal9 -# This is higuita's make install/uninstall patch. Needs testing please!!! -# -# Revision 1.118 2002/09/11 08:22:37 oes -# Fixed path (C_HDRS are in src/ now) -# -# Revision 1.117 2002/09/06 23:33:35 hal9 -# Fix clobber for config.h and config.h.in are in src now. -# -# Revision 1.116 2002/09/06 05:22:57 hal9 -# Adapt make webserver target to 3.0 for pdf uploading. -# -# Revision 1.115 2002/09/05 19:13:04 hal9 -# Migrate Karstens make snapshot stuff (not tested). -# -# Revision 1.114 2002/09/05 11:58:30 oes -# Synced in some changes fromm the stable branch: -# From Revision 1.104.2.14 2002/08/10 11:19:37 oes: -# - Add dependency: pcrs.o deps on config.h -# Revision 1.104.2.9 2002/07/26 15:17:02 oes -# - Added generation of default.action from defaul.action.master -# - Deleted obsolete re_filterfile.txt generation -# -# Revision 1.113 2002/07/30 21:50:25 hal9 -# Add redhat-test target, and migrate the RPM_PACKAGEV stuff from 3.0 branch. -# -# Revision 1.112 2002/06/28 18:30:10 jongfoster -# Fixing bugs compiling PCRE -# -# Revision 1.111 2002/06/05 00:26:21 hal9 -# Move all doc build stuff to doc/source/GNUmakefile, leaving a 'make dok' -# target only in toplevel. Add DOC_STATUS variable so docs can be built without -# touching sgml source. -# -# Revision 1.110 2002/06/04 14:51:48 jongfoster -# Updating for new paths: -# - Source files in src/ -# - Object files in obj/ -# -# Revision 1.109 2002/05/28 09:16:15 oes -# Added comment for -notoc kludge -# -# 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.159 2008/03/21 11:13:53 fabiankeil +# Only gather host information if it's actually needed. +# Also move the code out of accept_connection() so it's less likely +# to delay other incoming connections if the host is misconfigured. +# +# Revision 1.158 2007/12/11 21:29:25 fabiankeil +# Fix dependency list for cgiedit.c. +# +# Revision 1.157 2007/12/10 02:28:02 hal9 +# Unset $LANG for text processing of docs so we get pure text. +# +# Revision 1.156 2007/11/15 03:17:43 hal9 +# Some workaround changes to the config file perl stuff and comments, which is +# broken here all by itself on perl 5.8.8. +# +# Revision 1.155 2007/09/22 16:23:25 fabiankeil +# Update copyright line. +# +# Revision 1.154 2007/02/07 11:52:40 fabiankeil +# Fix suse-dist as described in BR#1654052. +# (I didn't test it, but it's done the same +# way in redhat-dist which is known to work). +# +# Revision 1.153 2007/01/07 07:36:36 joergs +# Added AmigaOS4 support. +# +# Revision 1.152 2006/12/13 14:53:51 etresoft +# Include any existing LDFLAGS environment when linking so that a MacOS X Universal Binary can be created. +# +# Revision 1.151 2006/11/30 01:08:55 hal9 +# Fix problem with variable declarations in the Slackware section. Thanks to higuita. +# +# Revision 1.150 2006/10/25 11:55:45 fabiankeil +# Fix sed regexes for rewriting "confdir ." and "logdir .". +# Thanks to Darel Henman for reporting this. +# +# Revision 1.149 2006/10/11 01:40:28 hal9 +# Apply patch from Neil McCalden to fix syntax issue. +# +# Revision 1.148 2006/09/26 10:57:58 hal9 +# Including Karsten's patch to fix make create-snapshot. +# +# Revision 1.147 2006/09/13 01:25:16 hal9 +# Make sure install forces in new default.action, default.filter, and +# standard.filter. These are privoxy files, not user files. +# +# 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. +# +# Revision 1.141 2006/08/12 03:54:37 david__schmidt +# Windows service integration +# +# Revision 1.140 2006/07/18 14:48:45 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) +# +# Revision 1.104.2.28 2004/06/10 17:06:05 hal9 +# Fix bug #959617, by moving TMPDIR var to create-snapshot target, which is the +# only place it is used. +# +# Revision 1.104.2.27 2004/02/07 16:11:10 oes +# Make clobber remove the autom4te.cache dir. +# Closes BR #889300 +# +# Revision 1.104.2.26 2004/01/31 16:32:25 oes +# Adding a check for an htmldoc variant from the debian diff +# +# Revision 1.104.2.25 2004/01/31 01:15:33 oes +# Fixed a typo; updated copyright notice +# +# Revision 1.104.2.24 2003/12/03 10:30:02 oes +# - Added new dependency: actions.c -> ssplit.h +# - Excluded PDF docs from src tarball +# +# Revision 1.104.2.23 2003/04/20 17:28:52 hal9 +# Strip trailing spaces from config-file generation, bug #724596. +# +# Revision 1.104.2.22 2003/03/28 03:32:01 hal9 +# Minor changes for Privoxy home page: +# - Handle © more sanely +# - include link to announce.txt +# Also, disable 'make announce' target. +# +# Revision 1.104.2.21 2002/11/04 07:04:03 hal9 +# Catch up with main trunk install/uninstall. Quiet output, etc. +# +# Revision 1.104.2.20 2002/10/25 02:44:22 hal9 +# Port of make install, etc from main trunk. Needs testing! Add Slackware +# support, and other related changes. Update related docs. +# +# Revision 1.104.2.19 2002/09/26 22:50:02 hal9 +# New user-manual examples in config-file are getting wrapped. Add warning. +# +# Revision 1.104.2.18 2002/08/23 12:22:40 oes +# Added warning to broken install target +# +# Revision 1.104.2.17 2002/08/16 03:19:34 hal9 +# More (minor) cleanup of html before pdf processing to make some relative +# links work as pdf -> pdf. Upload pdf as zip archive now. +# +# Revision 1.104.2.16 2002/08/14 16:43:27 hal9 +# Added pdf docs to make webserver target. +# +# Revision 1.104.2.15 2002/08/11 20:02:41 hal9 +# New targets for man page (make man) and pdf (make dok-pdf) targets. +# +# Revision 1.104.2.14 2002/08/10 11:19:37 oes +# - Make -Ipcre (again) conditional on STATIC_PCRE +# - $(RPMBUILD) -> $(RPM) for SuSE +# - Add dependency: pcrs.o deps on config.h +# +# Revision 1.104.2.13 2002/08/07 15:13:54 hal9 +# Remove pdf2 target, and make it dok-shtml (single page html for pdf +# conversion). +# +# Revision 1.104.2.12 2002/08/06 11:29:36 oes +# Fixed detection/inclusion of pcre.h, which is in a pcre subdir on RH +# +# Revision 1.104.2.11 2002/07/30 19:38:11 hal9 +# Add redhat-test target for testing purposes only. Fix RPM_PACKAGEV to what +# *I think* it was supposed to be (was breaking upload targets since it was +# set to RPM_VERSION). +# +# Revision 1.104.2.10 2002/07/27 22:56:53 kick_ +# cleanups of the redhat-srpm target +# +# Revision 1.104.2.9 2002/07/26 15:17:02 oes +# - Added generation of default.action from defaul.action.master +# - Deleted obsolete re_filterfile.txt generation +# +# Revision 1.104.2.8 2002/07/12 10:04:32 kick_ +# added helper targets to the makefile. They shouldn't break anything, but +# make my life a lot easier. +# +# The new rpm has been splitted into two parts, one for package installation/ +# removal, one for package building. +# Therefore rpm -ta isn't a valid command anymore and needs to be replaced +# by rpmbuild -ta (this is backwards compatible) +# +# Revision 1.104.2.7 2002/06/07 00:23:47 hal9 +# Fixing a quirk of man2html (on my system) that pulls punctuation into URLs, +# thus breaking them completely. +# +# Revision 1.104.2.6 2002/06/02 03:26:25 hal9 +# Update CONFIG_FILES (ie update basic.action, etc), and also DOC_FILES (exclude +# index.html and team/index.html) +# +# Revision 1.104.2.5 2002/05/30 15:35:01 hal9 +# This is more cleanup on the make config-file target. Most issues for +# automatic generation are taken care of. There are still some problems +# that require hand editing. Namely, some of the examples that are > 80 chars. +# +# Revision 1.104.2.4 2002/05/29 02:12:17 hal9 +# Ooops...forgot about perl -pi cygwin problem. Add -pi.bak. Also, the +# new target is 'make config-file', _not_ make config. +# +# Revision 1.104.2.3 2002/05/29 02:05:48 hal9 +# 'make config' target added (WIP) for future generation of config file from +# text in u-m so the two are in sync. New generated config, which requires +# some hand editing for the time being. +# +# Revision 1.104.2.2 2002/05/28 02:32:55 hal9 +# New target 'make dok-index' for privoxy-index.html. Also, fixed *.bak files +# not being cleaned up in doc/webserver. +# +# Revision 1.104.2.1 2002/05/26 17:19:34 hal9 +# Remove Table of Contents from readme with oes's dsl trick. # # Revision 1.104 2002/05/24 00:03:49 oes # Use p_doc.css for the Homepage for consistency