X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=b40d7c6932dd06b44a1946a943bbb74c57295882;hp=d7a095d8fa274bfac00463f5bf31353887fb5634;hb=3d18a965e0d15a4be605cddd39393efcb1ba73ba;hpb=fb42e7db1228ade6d4d25a0af403383c54199898

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d7a095d8..b40d7c69 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,9 +1,9 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.3 2002/01/04 14:45:48 oes Exp $
+# $Id: GNUmakefile.in,v 1.87 2002/04/23 14:10:59 swa Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
-# IJBSWA team.  http://ijbswa.sourceforge.net
+# Privoxy team. http://www.privoxy.org/
 #
 # Based on the Internet Junkbuster originally written
 # by and Copyright (C) 1997 Anonymous Coders and 
@@ -27,177 +27,11 @@
 # or write to the Free Software Foundation, Inc., 59
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Log: GNUmakefile.in,v $
-# Revision 1.2  2001/12/30 14:07:31  steudten
-# - Add signal handling (unix)
-# - Add SIGHUP handler (unix)
-# - Add creation of pidfile (unix)
-# - Add action 'top' in rc file (RH)
-# - Add entry 'SIGNALS' to manpage
-# - Add exit message to logfile (unix)
-#
-# Revision 1.1  2001/12/01 11:22:57  jongfoster
-# Renaming Makefile.in to GNUmakefile.in so that non-GNU versions of
-# make break in a more obvious way.
-# Adding .PHONY section.
-#
-# Revision 1.40  2001/12/01 00:24:11  jongfoster
-# Renaming various config files
-# Fixing CR->CRLF under Win32 (I hope)
-#
-# Revision 1.39  2001/11/06 12:07:30  steudten
-# Add --clean for building rpm in target redhat-dist.
-#
-# Revision 1.38  2001/11/05 21:35:23  steudten
-# Complete rewrite for the 'redhat-dist' target.
-# Checks for writeable RPM build directories for calling user.
-# So you must not be root, just set the modes to 1777 to
-# build a RH package.
-# Fix the upload-target to be arch independant.
-# Add target for 'solaris-dist' - coming soon.
-#
-# Revision 1.37  2001/11/01 00:52:04  hal9
-# Redhat-upload stuff per Stefan.
-#
-# Revision 1.36  2001/10/31 19:26:13  swa
-# automate process of uploading new releases
-# to sf.
-#
-# Revision 1.35  2001/10/15 22:14:59  joergs
-# Removed -O2 and -Wall from AmigaOS-only CFLAGS since they are now in
-#  the general CFLAGS already.
-#
-# Revision 1.34  2001/10/15 18:28:06  steudten
-# remove config.cache for target clobber.
-# Cleanup make dist for RH and S.u.S.E.
-#
-# Revision 1.33  2001/10/10 12:43:33  oes
-# Added ugly hack to make install target work at least for some setups.
-#
-# Revision 1.32  2001/10/09 22:38:19  jongfoster
-# Correcting actionsfile filename for Win32 INI build
-#
-# Revision 1.31  2001/09/23 10:13:48  swa
-# upload process established. run make webserver and
-# the documentation is moved to the webserver. documents
-# are now linked correctly.
-#
-# Revision 1.30  2001/09/19 17:55:49  oes
-# Fixed CFLAGS
-#
-# Revision 1.29  2001/09/16 17:34:27  jongfoster
-# Removing showargs.[ch], adding cgi(simple|edit).[ch]
-# Replacing $(OBJEXT) with @OBJEXT@ - this seems to be a common source
-# of build problems.
-#
-# Revision 1.28  2001/09/13 15:19:08  swa
-# we want text files as well.
-#
-# Revision 1.27  2001/09/13 13:11:37  steudten
-#
-# Replace DEBUG_CFLAGS with OTHER_CFLAGS
-#
-# Revision 1.26  2001/09/12 23:44:54  david__schmidt
-# Mac OSX (Darwin) support added.
-#
-# Revision 1.25  2001/09/12 22:55:45  joergs
-# AmigaOS support added.
-#
-# Revision 1.24  2001/09/12 17:28:59  david__schmidt
-#
-# OS/2 port: update autoconf'd support for the platform.
-#
-# Revision 1.23  2001/09/12 16:28:42  swa
-# added "make dok" section to generate html pages from
-# the sgml source documents. note that the we do not want
-# generated stuff in cvs.
-#
-# Revision 1.22  2001/09/10 16:31:23  swa
-# buildroot definition in the specfile fucks up the build
-# process under suse. hence I moved it to the "rpm -ta"
-# command
-#
-# Revision 1.21  2001/09/10 11:12:49  oes
-# Turning on -Wall
-#
-# Revision 1.20  2001/08/02 22:04:29  jongfoster
-# Removing some remaining references to obsolete w32rulesdlg.[ch]
-#
-# Revision 1.19  2001/07/30 22:14:03  jongfoster
-# Removing obsolete w32rulesdlg.c and w32rulesdlg.h
-#
-# Revision 1.18  2001/07/29 17:09:17  jongfoster
-# Major changes to build system in order to fix these bugs:
-# - pthreads under Linux was broken - changed -lpthread to -pthread
-# - Compiling in MinGW32 mode under CygWin now correctly detects
-#   which shared libraries are available
-# - Solaris support (?) (Not tested under Solaris yet)
-#
-# Revision 1.17  2001/07/28 16:44:54  oes
-# Fixed sed LF->CRLF conversion and removed deprecated files
-#
-# Revision 1.16  2001/07/15 19:45:33  jongfoster
-# Added support for linking with POSIX threads library
-#
-# Revision 1.15  2001/07/13 13:48:07  oes
-#  - Moved STATIC #define for pcre to (ac)config.h
-#  - Made -Ipcre depandant on static pcre compilation to
-#    avoid version conflicts
-#  - Included compilation and depandancies for new deanimate.c
-#  - Made changes to the pcre/pcreposix/pcrs build process
-#    as required by the new library autodetection in
-#    configure.in
-#
-# Revision 1.14  2001/07/01 16:27:44  oes
-# Fixed misplaced dependancy
-#
-# Revision 1.13  2001/06/29 13:18:36  oes
-# - added depandancy of filters.o on cgi.h
-#
-# Revision 1.12  2001/06/12 17:15:56  swa
-# fixes, because a clean build on rh6.1 was impossible.
-# GZIP confuses make, %configure confuses rpm, etc.
-#
-# Revision 1.11  2001/06/11 11:26:35  sarantis
-# RPM version should be the same as ijbswa version.  The rpm release is
-# specified in the specfile.
-#
-# Revision 1.10  2001/06/07 17:27:45  swa
-# added suse build section
-#
-# Revision 1.9  2001/06/04 18:31:58  swa
-# files are now prefixed with either `confdir' or `logdir'.
-# `make redhat-dist' replaces both entries confdir and logdir
-# with redhat values
-#
-# Revision 1.8  2001/06/04 10:44:57  swa
-# `make redhatr-dist' now works. Except for the paths
-# in the config file.
-#
-# Revision 1.7  2001/06/03 17:09:09  swa
-# swa for oes: reversed my earlier change
-#
-# Revision 1.6  2001/06/03 17:07:27  swa
-# swa for oes
-#
-# Revision 1.5  2001/06/03 13:57:26  swa
-# compile cgi.c (for andreas' GUI)
-#
-# Revision 1.4  2001/05/31 21:18:45  jongfoster
-# Added files actions.[ch], actionlist.h, list.[ch] to Makefile
-#
-# Revision 1.3  2001/05/29 20:02:48  joergs
-# Changes for AmigaOS added.
-#
-# Revision 1.2  2001/05/17 22:23:23  oes
-#  - Added auto-generation of CRLFs for Win32 config files
-#  - Added comment-prefix to all Win32-only options in the config file
-#    and provided auto stripping of this prefix for the Win32 platform by make
-#
-# Revision 1.1.1.1  2001/05/15 13:59:00  oes
-# Initial import of version 2.9.3 source tree
-#
-#
+
+#############################################################################
+# Set make command correctly
+#############################################################################
+@SET_MAKE@
 
 #############################################################################
 # Version number (for RPM)
@@ -208,39 +42,55 @@ VERSION_MINOR = @VERSION_MINOR@
 VERSION_POINT = @VERSION_POINT@
 CODE_STATUS   = @CODE_STATUS@
 VERSION       = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
-# will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile
 RPM_VERSION   = $(VERSION)
-RPM_PACKAGEV  = 2
 
 
 #############################################################################
 # Directories for "make install"
 #############################################################################
 
-DEST        = @sysconfdir@/junkbuster
-SBIN_DEST   = @sbindir@
-MAN_DEST    = @mandir@
-
+DEST        = @prefix@
+CONFDEST    = @prefix@@sysconfdir@
+SBIN_DEST   = @prefix@@sbindir@
+MAN_DEST    = @prefix@@mandir@
+DOK_WEB_USEM=doc/webserver/user-manual
 
 #############################################################################
 # Build tools
 #############################################################################
 
-PROGRAM    = junkbuster@EXEEXT@
+PROGRAM    = privoxy@EXEEXT@
 CC         = @CC@
 ECHO       = echo
 GZIP_PROG  = gzip
-INSTALL    = cp -f
+#INSTALL    = cp -f
+INSTALL    = @INSTALL@
+INSTALL_P  = -m 0750 -g @GROUP@ -o @USER@ -b
+INSTALL_T  = -m 0640 -g @GROUP@ -o @USER@ -b
+INSTALL_D  = -m 0750 -g @GROUP@ -o @USER@ -d
 LD         = @CC@
 RM         = rm -f
 STRIP_PROG = strip
-SED	     = sed
+SED	   = sed
 CAT        = cat
 RPM        = rpm
-MV	        = mv
+MV	   = mv
 TAR        = tar
-MAKE       = make
 LN         = ln
+WDUMP      = @WDUMP@ -dump
+JADECAT    = @JADECAT@
+JADEBIN    = @JADEBIN@
+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@
+GROUP	   = @GROUP@
 
 # Program to do LF->CRLF
 #
@@ -249,14 +99,32 @@ LN         = ln
 #   - 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 
 #############################################################################
 
-TAR_ARCH = /tmp/ijbswa-$(RPM_VERSION).tar.gz
-RPM_BASE = /usr/src/redhat
+TAR_ARCH = /tmp/privoxy-$(RPM_VERSION).tar.gz
+RPM_BASE = @RPM_BASE@
+
+#############################################################################
+# We include these files in our distributions
+#############################################################################
+# take care that no CVS .cvsignore or other crappy files
+# are included here
+# and escape every '#' in the find. doh.
+CONFIG_FILES = config trust \
+		default.action \
+		basic.action intermediate.action advanced.action \
+		default.filter \
+		`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"` \
+		`find doc/webserver/ -name "*.html"` \
+		`find doc/webserver/ -name "*.css"` \
+                privoxy.1
 
 #############################################################################
 # Filenames and libraries
@@ -264,7 +132,8 @@ RPM_BASE = /usr/src/redhat
 
 C_SRC  = actions.c cgi.c cgiedit.c cgisimple.c deanimate.c encode.c \
          errlog.c filters.c gateway.c jbsockets.c jcc.c killpopup.c \
-         list.c loadcfg.c loaders.c miscutil.c parsers.c ssplit.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
@@ -274,7 +143,7 @@ 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
 W32_LIB   = @WIN_ONLY@-lwsock32 -lcomctl32
-W32_INIS  = @WIN_ONLY@config.txt trust.txt re_filterfile.txt
+W32_INIS  = @WIN_ONLY@config.txt trust.txt
 
 PCRS_SRC     = @STATIC_PCRS_ONLY@pcrs.c
 PCRS_OBJS    = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@)
@@ -284,12 +153,9 @@ PCRE_SRC     = @STATIC_PCRE_ONLY@pcre/get.c pcre/maketables.c pcre/study.c pcre/
 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 (Either because dynamically linked pcreposix, or no regex at all):
+# No REGEX (maybe because dynamically linked pcreposix):
 REGEX_SRC    =
-# GNU REGEX:
-@GNU_REGEX_ONLY@REGEX_SRC    = gnu_regex.c
-# PCRE REGEX:
-@PCRE_REGEX_ONLY@@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c
+@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c
 
 REGEX_OBJS   = $(REGEX_SRC:.c=.@OBJEXT@)
 REGEX_HDRS   = $(REGEX_SRC:.c=.h)
@@ -341,7 +207,8 @@ all: $(PROGRAM)
 # Phony targets
 #############################################################################
 .PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \
-suse-upload win-dist tarball-dist dok webserver clean clobber tags install
+suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \
+install
 
 
 #############################################################################
@@ -360,13 +227,14 @@ inifiles: $(W32_INIS)
 config.txt: config
 	$(SED) -e 's!\trustfile trust!trustfile trust.txt!' \
 	       -e 's!\jarfile jarfile!jarfile jar.log!' \
-	       -e 's!\logfile logfile!logfile junkbuster.log!' \
-	       -e 's!\re_filterfile re_filterfile!re_filterfile re_filterfile.txt!' \
+	       -e 's!\logfile logfile!logfile privoxy.log!' \
 	       -e 's!#Win32-only: !!' \
 	       < $< | \
 	       $(DOSFILTER) > $@
-	# LF to CRLF in ijb.action
-	$(DOSFILTER) <ijb.action >ijb.action.txt && mv ijb.action.txt ijb.action
+	# LF to CRLF in default.action
+	$(DOSFILTER) <default.action >default.action.txt && mv default.action.txt default.action
+	# LF to CRLF in default.filter
+	$(DOSFILTER) <default.filter >default.filter.txt && mv default.filter.txt default.filter
 
 trust.txt: trust
 	$(DOSFILTER) < $< > $@ 
@@ -376,35 +244,70 @@ re_filterfile.txt: re_filterfile
 
 
 #############################################################################
-# redhat distribution alpha and x86
+# 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;
+
 
-redhat-dist:
-	@for dir in RPMS SRPMS BUILD SOURCES SPECS; do \
+#############################################################################
+# RPM specifice stuff (SuSE or Redhat, ..)
+#############################################################################
+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."; \
-			exit; \
+			$(ECHO) "Or add a suitable path to .rpmmacros like."; \
+			$(ECHO) "%_topdir /home/foo/rpm-build"; \
+			exit 1; \
 		fi; \
-	done ; \
-	$(MAKE) clobber; \
-	[ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH); \
-	$(CAT) junkbuster-rh.spec | \
-		$(SED) 's/^Version:.*/Version: $(RPM_VERSION)/g;s/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && \
-		$(MV) -f abc junkbuster-rh.spec; \
-	$(CAT) junkbuster.init | \
-		$(SED) 's#JB_PID=.*/\(.*\.pid\).*#JB_PID=@PID_FILE_PATH@/\1#g' > abc && \
-		$(MV) -f abc junkbuster.init; \
-	$(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf $(TAR_ARCH) . ; \
-	$(RPM) --clean -ta  $(TAR_ARCH); \
-	[ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH)
+	done; \
+
+#############################################################################
+# redhat distribution alpha and x86
+#############################################################################
+redhat-dist: rpm-stuff
+
+	$(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
+
+check-release:
+	@if [ "$(RPM_PACKAGEV)" = "" ]; then \
+		echo ; \
+		echo "	ERROR: NO RPM_PACKAGEV VALUE"; \
+		echo "	No value given for RPM_PACKAGEV. Please use:"; \
+		echo "	make dist-upload RPM_PACKAGEV=release"; \
+		echo "	where \"release\" is the release number you want to and"; \
+		echo "	where \"dist\" is the name of the distro \(redhat or suse\)"; \
+		echo ; \
+		echo "	Ex: make redhat-upload RPM_PACKAGEV=1"; \
+		echo ; \
+		exit 1; \
+	fi
 
-#
 # anonymously ncftps the rpms to sourceforge
-#
-redhat-upload:
-	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/junkbuster-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm
+redhat-upload: check-release
+	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm
 # better should use `arch` here instead of ix86 to support other platforms too
-	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/junkbuster-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
+	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
 	@$(ECHO) -------------------------------------------------------
 	@$(ECHO) Now goto
 	@$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
@@ -413,36 +316,28 @@ redhat-upload:
      # w3m http://sourceforge.net/project/admin/editpackages.php?group_id=11118
 
 #############################################################################
-# sun solaris  distribution
-#############################################################################
-solaris-dist:
-	@$(ECHO) coming soon. 
-
-#############################################################################
-# suse distribution (need to be root to build)
+# suse distribution. works fine. no need to be root. 
 #############################################################################
+suse-dist: rpm-stuff
+	TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \
+	if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \
+             -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \
+              privoxy-suse.spec > $$TMPFILE ; then \
+	$(MV) -f $$TMPFILE privoxy-suse.spec; \
+	else \
+		$(ECHO) "Could not set version info in specfile."; \
+	exit 1;\
+	fi
+
+	$(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
 
-suse-dist:
-	@make clobber
-# verify that i'm root needs to be done
-	rm -f ../ijbswa.tar.gz
-# verify all version strings, FLAGS, etc. in the spec file
-	cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && mv -f abc junkbuster-suse.spec
-	tar --exclude "CVS" --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz .
-# verify all files in their correct location needs to be done
-# never use buildroot to define the location inside the spec
-# file or suse will fuck up the build process.
-	cd .. && rpm -ta --buildroot /tmp/xxx ijbswa.tar.gz
-	chmod a+r /usr/src/packages/SRPMS/*
-	chmod a+r /usr/src/packages/RPMS/i386/*
-
-#
 # anonymously ncftps the rpms to sourceforge
-#
-suse-upload:
-	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming /usr/src/packages/SRPMS/junkbuster-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm
+suse-upload: check-release
+	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm
 # better should use `arch` here instead of ix86 to support other platforms too
-	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming /usr/src/packages/RPMS/*/junkbuster-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
+	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
 	@$(ECHO) -------------------------------------------------------
 	@$(ECHO) Now goto
 	@$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
@@ -451,13 +346,118 @@ suse-upload:
 
 # handle with care. use with root.
 suse-clean:
-	rpm -e junkbuster-suse
+	rpm -e junkbuster-suse || true
 	rm -rf /etc/junkbuster
+	rm -rf /etc/rc.d/junkbuster*
+	rm -rf /var/run/junkbuster.pid 
 	rm -rf /var/log/junkbuster
 	rm -f /etc/init.d/junkbuster
 	rm -f /usr/sbin/junkbuster
 	rm -f /usr/sbin/rcjunkbuster
 	rm -f /usr/share/man/man1/junkbuster.1.gz
+	rpm -e privoxy-suse || true
+	rm -rf /etc/privoxy
+	rm -rf /etc/rc.d/privoxy*
+	rm -rf /var/run/privoxy.pid 
+	rm -rf /var/log/privoxy
+	rm -f /etc/init.d/privoxy
+	rm -f /usr/sbin/privoxy
+	rm -f /usr/sbin/rcprivoxy
+	rm -f /usr/share/man/man1/privoxy.1.gz
+
+#############################################################################
+# generic distribution
+#############################################################################
+gen-dist: dist-check
+	@$(ECHO) ""
+	@$(ECHO) "You have run autoconf && autoheader && ./configure right?"
+	@$(ECHO) ""
+	$(MAKE) $(PROGRAM)
+	$(STRIP_PROG) $(PROGRAM)
+	$(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
+# add program
+	(cd .. && $(TAR) -cvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM))
+# add config files
+	for foo in $(CONFIG_FILES); 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;
+# and zip the archive
+	$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
+	$(GZIP_PROG) ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar
+	@$(ECHO) Distribution with binary created.
+
+# anonymously ncftps the package to sourceforge
+gen-upload:
+	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar.gz
+	@$(ECHO) -------------------------------------------------------
+	@$(ECHO) Now goto
+	@$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+	@$(ECHO) ... and release the files.
+	@$(ECHO) -------------------------------------------------------
+
+# use with care
+gen-clean:
+	$(RM) privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar*
+
+#############################################################################
+# solaris distribution. verified on SF machines by swa.
+#############################################################################
+solaris-dist: gen-dist
+	@$(ECHO) Done.
+# anonymously ncftps the package to sourceforge
+solaris-upload: gen-upload
+	@$(ECHO) Done.
+# use with care
+solaris-clean: gen-clean
+	@$(ECHO) Done.
+
+#############################################################################
+# hpux distribution
+#############################################################################
+hpux-dist:
+	@$(ECHO) coming soon. 
+hpux-upload:
+	@$(ECHO) coming soon. 
+
+#############################################################################
+# debian distribution
+#############################################################################
+debian-dist:
+	@$(ECHO) coming soon. 
+debian-upload:
+	@$(ECHO) coming soon. 
+
+#############################################################################
+# macosx distribution
+#############################################################################
+macosx-dist:
+	@$(ECHO) coming soon. 
+macosx-upload:
+	@$(ECHO) coming soon. 
+
+#############################################################################
+# amiga distribution
+#############################################################################
+amiga-dist:
+	@$(ECHO) coming soon. 
+amiga-upload:
+	@$(ECHO) coming soon. 
+
+#############################################################################
+# freebsd distribution. verified on SF machines by swa.
+#############################################################################
+freebsd-dist: gen-dist
+	@$(ECHO) Done.
+# anonymously ncftps the package to sourceforge
+freebsd-upload: gen-upload
+	@$(ECHO) Done.
+# use with care
+freebsd-clean: gen-clean
+	@$(ECHO) Done.
 
 #############################################################################
 # Windows distribution
@@ -467,15 +467,35 @@ win-dist:
 
 
 #############################################################################
-# Tarball distribution
+# Tarball distribution: No CVS dirs, dotfiles, debian build dir,
+# (FIXME:) only parts of the static / generated docs mix in doc/webserver
 #############################################################################
-tarball-dist:
-	@make clean
-	make $(PROGRAM) 
-#	remove all objects and create the tarball with the binary
-	cd .. && $(RM) ijb/a.out ijb/core ijb/*.@OBJEXT@ && tar --exclude "ijb/CVS" -cvzf ../ijb-distribution-$(VERSION).tar.gz ijb/
-	chmod a+r ../../ijb-distribution-$(VERSION).tar.gz
-	@$(ECHO) Tarball with binary created.
+
+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" \)`; 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-$(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
+	@$(ECHO) -------------------------------------------------------
+	@$(ECHO) Now goto
+	@$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+	@$(ECHO) ... and release the files.
+	@$(ECHO) -------------------------------------------------------
+
+tarball-clean:
+	$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
 
 #############################################################################
 #
@@ -484,20 +504,153 @@ tarball-dist:
 # converts doc/source/*.sgml into html, text and man pages
 #
 #############################################################################
-dok:
-	mkdir -p doc/text doc/man
-#  user manual
-	rm -rf doc/webserver/user-manual
-	cd doc/source && db2html -s ldp.dsl user-manual.sgml && mv user-manual ../webserver
-	cd doc/source && db2html -s ldp.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual
-##  developer manual
-	rm -rf doc/webserver/developer-manual
-	cd doc/source && db2html -s ldp.dsl developer-manual.sgml && mv developer-manual ../webserver
-	cd doc/source && db2html -s ldp.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual
-##  faq
-	rm -rf doc/webserver/faq
-	cd doc/source && db2html -s ldp.dsl faq.sgml && mv faq ../webserver
-	cd doc/source && db2html -s ldp.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq
+
+# our style file
+doc/source/ldpOK.dsl:
+	if [ "$(DKPREFIX)" != "none" ]; then \
+		sed -e "s@/usr/share/sgml/docbook/dsssl-stylesheets@$(DKPREFIX)@g" doc/source/ldp.dsl > doc/source/ldpOK.dsl; \
+	else \
+		cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \
+	fi
+
+# Otherwise we get plain groff conversion.
+groff2html:
+	$(G2H_CMD) ./privoxy.1 | $(SED) -e 's@</head>@<link REL="STYLESHEET" TYPE="text/css" HREF="../p_doc.css"></head>@' > doc/webserver/man-page/privoxy-man-page.html
+
+# developer manual
+dok-devel: doc/source/ldpOK.dsl
+	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
+dok-user: doc/source/ldpOK.dsl
+	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
+dok-faq: doc/source/ldpOK.dsl
+	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
+dok-man: doc/source/ldpOK.dsl
+	rm -f doc/man/* doc/webserver/man-page/*.html
+ifneq ($(MAN2HTML),false)
+	$(ECHO) "<html><head><title>Privoxy Man page</title><link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\"></head><body><H2>NAME</H2>" > doc/webserver/man-page/privoxy-man-page.html
+	man ./privoxy.1 | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html
+	$(ECHO) "</body></html>" >> 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<meta name=\"description\" content=\"Privoxy helps consumers reduce unwanted junk email and protect their privacy from direct marketing companies.\"><\/HEAD/;\
+	s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/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. 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
+ifneq ($(MAN2HTML),false)
+	$(MAN2HTML) privoxy.1 |grep -v "^Content-type" > tmp.html
+	$(PERL) -pi.bak -e 's/<A .*Contents<\/A>//; s/<A .*man2html<\/A>/man2html/' tmp.html
+	$(PERL) -pi.bak -e 's/(<\/HEAD>)/<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"..\/p_doc.css\"><\/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?
+	@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/ <URL:.*>//; 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/<!entity +p-version.*>/<!entity p-version "$(VERSION)">/;\
+     s/<!entity +p-status.*>/<!entity p-status "$(CODE_STATUS)">/' \
+     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/<!entity +% +p-stable.*>/<!entity % p-stable "INCLUDE">/;\
+     s/<!entity +% +p-not-stable.*>/<!entity % p-not-stable "IGNORE">/' \
+     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/<!entity +% +p-stable.*>/<!entity % p-stable "IGNORE">/;\
+     s/<!entity +% +p-not-stable.*>/<!entity % p-not-stable "INCLUDE">/' \
+     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
 
 #############################################################################
 #
@@ -506,15 +659,33 @@ dok:
 # moves dokumentation to webserver
 #
 #############################################################################
-webserver:
+webserver: tidy
 	@$(ECHO) -------------------------------------------------------
-	@$(ECHO) You have run make dok before, right?
+	@$(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) -------------------------------------------------------
-	chmod -R a+r doc/webserver
-	find doc/webserver -type d -exec chmod a+rx {} \;
-	cd doc/webserver && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
+
+	@$(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 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
@@ -538,6 +709,7 @@ loaders.@OBJEXT@:   loaders.c   loaders.h   config.h $(PROJECT_H_DEPS) errlog.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
@@ -565,7 +737,7 @@ w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h pcre/pcre
 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
 
-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/junkbust.ico config.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
@@ -580,19 +752,25 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
 	$(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
 
 clean:
-	$(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS)
+	$(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: clean
-	$(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` TAGS junkbuster.log config.cache *~ *.tar.gz
+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? 
+#
+	$(RM) cscope.*  *.pdb *.lib *.exp 
+
+distclean: clobber
 
 tags: $(SRCS) $(HDRS)
 	etags $(SRCS) $(HDRS)
 
-tarball-src: clobber
-	$(LN) -s current ../ijb-$(VERSION)-$(CODE_STATUS)
-	$(TAR) -C.. -cvhzf ijb-$(VERSION)-$(CODE_STATUS)-src.tar.gz ijb-$(VERSION)-$(CODE_STATUS)
-	$(RM) ../ijb-$(VERSION)-$(CODE_STATUS)
-
 install: all
 	#
 	# FIXME: This is a dirty hack to have an install target
@@ -600,15 +778,17 @@ install: all
 	#        to be fixed!
 	#
 	$(STRIP_PROG) $(PROGRAM)
-	$(INSTALL) $(PROGRAM) $(SBIN_DEST)
-	mkdir -p $(DEST)/user-manual
-	mkdir -p $(DEST)/templates
-	cp -r doc/webserver/user-manual $(DEST)
-	cp -r templates $(DEST)
-	$(INSTALL) config ijb.action re_filterfile trust $(DEST)
-	# FIXME $(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly
-	# FIXME: Need new manual! $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz
-	$(INSTALL) junkbuster.init /etc/init.d/junkbuster
+	$(INSTALL) $(INSTALL_D) $(SBIN_DEST)
+	$(INSTALL) $(INSTALL_D) $(DEST)/user-manual
+	$(INSTALL) $(INSTALL_D) $(CONFDEST)/templates
+	$(INSTALL) $(INSTALL_D) $(DEST)/$(DOK_WEB_USEM)
+	$(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST)
+	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
+	$(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy
 
 
 #############################################################################
@@ -616,3 +796,510 @@ install: all
 ## Local Variables:
 ## tab-width: 3
 ## end:
+
+# $Log: GNUmakefile.in,v $
+# Revision 1.87  2002/04/23 14:10:59  swa
+# now create pdf documents
+#
+# 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
+#
+# Revision 1.56  2002/04/03 22:28:03  gliptak
+# Removed references to gnu_regex
+#
+# Revision 1.55  2002/04/03 19:54:29  swa
+# freebsd tested to work. attempt to move tarball dist target forward
+#
+# Revision 1.54  2002/04/03 14:54:07  oes
+# Standard clean and clobber semantics II
+#
+# Revision 1.53  2002/04/03 14:19:16  oes
+# Standard clean and clobber semantics
+#
+# Revision 1.52  2002/04/03 02:56:18  hal9
+# Revert previous FAQ numbering kludge.
+#
+# Revision 1.51  2002/04/02 13:03:56  oes
+# Added fix for webserver permissions
+#
+# Revision 1.50  2002/04/02 03:46:24  hal9
+# Rewrite ldpOK.dsl so that sections are NOT numbered on FAQ, in an effort
+# to make the Table of Contents not so 'busy' looking. SuSE needs testing :)
+#
+# Revision 1.49  2002/03/30 22:20:12  swa
+# cd didn't work. neither did find.
+#
+# Revision 1.48  2002/03/30 19:04:06  swa
+# people release differently. no good.
+# I want to make parts of the docs only.
+#
+# Revision 1.47  2002/03/30 09:05:21  swa
+# better packaging. better rpm building.
+# tar failed on sun (no exclude there).
+#
+# Revision 1.46  2002/03/29 20:09:01  swa
+# al's patch
+#
+# Revision 1.45  2002/03/29 19:45:45  swa
+# for lazy swa
+#
+# Revision 1.44  2002/03/29 17:42:44  gliptak
+# Correcting for Solaris tar limitations
+#
+# Revision 1.43  2002/03/29 07:40:03  swa
+# fixed make webserver. doh
+#
+# Revision 1.42  2002/03/29 06:59:04  swa
+# other users could not modify files on webserver
+#
+# Revision 1.41  2002/03/28 20:43:00  swa
+# set make correctly
+#
+# Revision 1.40  2002/03/28 04:22:44  hal9
+# More on man2html stuff.
+#
+# Revision 1.39  2002/03/28 01:04:14  hal9
+# More man2html stuff for docs.
+#
+# Revision 1.38  2002/03/27 16:02:30  swa
+# have a generic target
+#
+# Revision 1.37  2002/03/27 15:30:26  swa
+# have a consistent appearance
+#
+# Revision 1.36  2002/03/27 14:58:08  swa
+# can be used by mutilple targets
+#
+# Revision 1.35  2002/03/27 14:53:19  swa
+# added solaris-dist
+#
+# Revision 1.34  2002/03/27 10:30:11  swa
+# we want a html man file on the webserver
+#
+# Revision 1.33  2002/03/27 03:05:35  hal9
+# Added man2html target for docs (redhat-dok only for now)
+#
+# Revision 1.32  2002/03/26 22:29:54  swa
+# we have a new homepage!
+#
+# Revision 1.31  2002/03/26 14:00:18  swa
+# fixed make tarball, tarball-dist, tarball-clean
+#
+# Revision 1.30  2002/03/25 12:52:25  swa
+# new targets
+#
+# Revision 1.29  2002/03/24 17:03:55  jongfoster
+# Name change
+#
+# Revision 1.28  2002/03/24 16:19:48  swa
+# configure needs to be generated.
+#
+# Revision 1.27  2002/03/24 16:13:57  swa
+# generated files are a nono in cvs
+#
+# Revision 1.26  2002/03/24 15:36:02  swa
+# did not build.
+#
+# Revision 1.25  2002/03/24 14:31:08  swa
+# remove more crappy files. set RPM
+# release version correctly.
+#
+# Revision 1.24  2002/03/24 14:19:55  swa
+# set rpm package release in configure.in. nowhere else.
+#
+# Revision 1.23  2002/03/24 13:06:49  swa
+# suse-clean now runs fine
+#
+# Revision 1.22  2002/03/24 12:56:21  swa
+# name change related issues.
+#
+# Revision 1.21  2002/03/24 12:43:57  swa
+# name change
+#
+# Revision 1.20  2002/03/24 11:39:17  jongfoster
+# Renaming config files
+#
+# Revision 1.19  2002/03/22 20:53:03  morcego
+# - Ongoing process to change name to JunkbusterNG
+# - configure/configure.in: no change needed
+# - GNUmakefile.in:
+#         - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
+#         - PROGRAM    = jbng@EXEEXT@
+#         - rh-spec now references as junkbusterng-rh.spec
+#         - redhat-upload: references changed to junkbusterng-* (package names)
+#         - tarball-dist: references changed to JunkbusterNG-distribution-*
+#         - tarball-src: now JunkbusterNG-*
+#         - install: initscript now junkbusterng.init and junkbusterng (when
+#                    installed)
+# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
+# - junkbusterng.spec:
+#         - References to the expression ijb where changed where possible
+#         - New package name: junkbusterng (all in lower case, acording to
+#           the LSB recomendation)
+#         - Version changed to: 2.9.13
+#         - Release: 1
+#         - Added: junkbuster to obsoletes and conflicts (Not sure this is
+#           right. If it obsoletes, why conflict ? Have to check it later)
+#         - Summary changed: Stefan, please check and aprove it
+#         - Changes description to use the new name
+#         - Sed string was NOT changed. Have to wait to the manpage to
+#           change first
+#         - Keeping the user junkbuster for now. It will require some aditional
+#           changes on the script (scheduled for the next specfile release)
+#         - Added post entry to move the old logfile to the new log directory
+#         - Removing "chkconfig --add" entry (not good to have it automaticaly
+#           added to the startup list).
+#         - Added preun section to stop the service with the old name, as well
+#           as remove it from the startup list
+#         - Removed the chkconfig --del entry from the conditional block on
+#           the preun scriptlet (now handled on the %files section)
+# - junkbuster.init: renamed to junkbusterng.init
+# - junkbusterng.init:
+#         - Changed JB_BIN to jbng
+#         - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
+#           be used where necessary (config dir)
+#
+# Aditional notes:
+# - The config directory is /etc/junkbuster yet. Have to change it on the
+# specfile, after it is changes on the code
+# - The only files that got renamed on the cvs tree were the rh specfile and
+# the init file. Some file references got changes on the makefile and on the
+# rh-spec (as listed above)
+#
+# Revision 1.18  2002/03/21 23:00:00  swa
+# want to autogenerate stuff.
+#
+# Revision 1.17  2002/03/19 19:30:04  morcego
+# - Fixing stylesheet checking on configure. If it is found, no further checks
+#   should be done
+#
+# - configure will now check for db2html or docbook2html (should work now
+#   on SuSe without the docbktls package)
+#
+# Revision 1.16  2002/03/14 22:32:32  hal9
+# Bumped the RPM version.
+#
+# Revision 1.15  2002/03/08 20:00:28  swa
+# some leftovers.
+#
+# Revision 1.14  2002/03/07 18:25:56  swa
+# synced redhat and suse build process
+#
+# Revision 1.13  2002/03/07 17:17:56  oes
+# (Hopefully) fixed for older make versions
+#
+# Revision 1.12  2002/03/07 15:28:27  swa
+# more informative
+#
+# Revision 1.11  2002/03/06 14:33:18  sarantis
+# Use proper temp file, not "abc".
+#
+# Revision 1.10  2002/03/06 14:19:35  sarantis
+# Cleanup PID_FILE_PATH from redhat-dist target
+#
+# Revision 1.9  2002/03/05 17:31:11  morcego
+# Search for docbook.dsl. Should solve portability problems for SuSe.
+#
+# Revision 1.8  2002/03/05 14:07:42  morcego
+# configure now detects rpm topdir, and change GNUmakefile acordingly
+#    (based on sugestion by Sarantis Paskalis)
+#
+# Revision 1.7  2002/03/05 13:43:28  morcego
+# Checking for text browser, so redhat-dok can work.
+#
+# Revision 1.6  2002/03/05 13:10:51  morcego
+# Changes to implement redhat-dok (Hal Burgiss)
+# Changes to make it work on other distros and out-of-the-shelf configurations
+#
+# Revision 1.5  2002/02/27 15:30:39  hal9
+# Reset $(RPM_PACKAGEV) to 1 (was 2)
+#
+# Revision 1.4  2002/01/17 21:44:04  jongfoster
+# Adding urlmatch.[ch]
+#
+# Revision 1.3  2002/01/04 15:26:08  oes
+# Added tarball-src target
+#
+# Revision 1.2  2001/12/30 14:07:31  steudten
+# - Add signal handling (unix)
+# - Add SIGHUP handler (unix)
+# - Add creation of pidfile (unix)
+# - Add action 'top' in rc file (RH)
+# - Add entry 'SIGNALS' to manpage
+# - Add exit message to logfile (unix)
+#
+# Revision 1.1  2001/12/01 11:22:57  jongfoster
+# Renaming Makefile.in to GNUmakefile.in so that non-GNU versions of
+# make break in a more obvious way.
+# Adding .PHONY section.
+#
+# Revision 1.40  2001/12/01 00:24:11  jongfoster
+# Renaming various config files
+# Fixing CR->CRLF under Win32 (I hope)
+#
+# Revision 1.39  2001/11/06 12:07:30  steudten
+# Add --clean for building rpm in target redhat-dist.
+#
+# Revision 1.38  2001/11/05 21:35:23  steudten
+# Complete rewrite for the 'redhat-dist' target.
+# Checks for writeable RPM build directories for calling user.
+# So you must not be root, just set the modes to 1777 to
+# build a RH package.
+# Fix the upload-target to be arch independant.
+# Add target for 'solaris-dist' - coming soon.
+#
+# Revision 1.37  2001/11/01 00:52:04  hal9
+# Redhat-upload stuff per Stefan.
+#
+# Revision 1.36  2001/10/31 19:26:13  swa
+# automate process of uploading new releases
+# to sf.
+#
+# Revision 1.35  2001/10/15 22:14:59  joergs
+# Removed -O2 and -Wall from AmigaOS-only CFLAGS since they are now in
+#  the general CFLAGS already.
+#
+# Revision 1.34  2001/10/15 18:28:06  steudten
+# remove config.cache for target clobber.
+# Cleanup make dist for RH and S.u.S.E.
+#
+# Revision 1.33  2001/10/10 12:43:33  oes
+# Added ugly hack to make install target work at least for some setups.
+#
+# Revision 1.32  2001/10/09 22:38:19  jongfoster
+# Correcting actionsfile filename for Win32 INI build
+#
+# Revision 1.31  2001/09/23 10:13:48  swa
+# upload process established. run make webserver and
+# the documentation is moved to the webserver. documents
+# are now linked correctly.
+#
+# Revision 1.30  2001/09/19 17:55:49  oes
+# Fixed CFLAGS
+#
+# Revision 1.29  2001/09/16 17:34:27  jongfoster
+# Removing showargs.[ch], adding cgi(simple|edit).[ch]
+# Replacing $(OBJEXT) with @OBJEXT@ - this seems to be a common source
+# of build problems.
+#
+# Revision 1.28  2001/09/13 15:19:08  swa
+# we want text files as well.
+#
+# Revision 1.27  2001/09/13 13:11:37  steudten
+#
+# Replace DEBUG_CFLAGS with OTHER_CFLAGS
+#
+# Revision 1.26  2001/09/12 23:44:54  david__schmidt
+# Mac OSX (Darwin) support added.
+#
+# Revision 1.25  2001/09/12 22:55:45  joergs
+# AmigaOS support added.
+#
+# Revision 1.24  2001/09/12 17:28:59  david__schmidt
+#
+# OS/2 port: update autoconf'd support for the platform.
+#
+# Revision 1.23  2001/09/12 16:28:42  swa
+# added "make dok" section to generate html pages from
+# the sgml source documents. note that the we do not want
+# generated stuff in cvs.
+#
+# Revision 1.22  2001/09/10 16:31:23  swa
+# buildroot definition in the specfile fucks up the build
+# process under suse. hence I moved it to the "rpm -ta"
+# command
+#
+# Revision 1.21  2001/09/10 11:12:49  oes
+# Turning on -Wall
+#
+# Revision 1.20  2001/08/02 22:04:29  jongfoster
+# Removing some remaining references to obsolete w32rulesdlg.[ch]
+#
+# Revision 1.19  2001/07/30 22:14:03  jongfoster
+# Removing obsolete w32rulesdlg.c and w32rulesdlg.h
+#
+# Revision 1.18  2001/07/29 17:09:17  jongfoster
+# Major changes to build system in order to fix these bugs:
+# - pthreads under Linux was broken - changed -lpthread to -pthread
+# - Compiling in MinGW32 mode under CygWin now correctly detects
+#   which shared libraries are available
+# - Solaris support (?) (Not tested under Solaris yet)
+#
+# Revision 1.17  2001/07/28 16:44:54  oes
+# Fixed sed LF->CRLF conversion and removed deprecated files
+#
+# Revision 1.16  2001/07/15 19:45:33  jongfoster
+# Added support for linking with POSIX threads library
+#
+# Revision 1.15  2001/07/13 13:48:07  oes
+#  - Moved STATIC #define for pcre to (ac)config.h
+#  - Made -Ipcre depandant on static pcre compilation to
+#    avoid version conflicts
+#  - Included compilation and depandancies for new deanimate.c
+#  - Made changes to the pcre/pcreposix/pcrs build process
+#    as required by the new library autodetection in
+#    configure.in
+#
+# Revision 1.14  2001/07/01 16:27:44  oes
+# Fixed misplaced dependancy
+#
+# Revision 1.13  2001/06/29 13:18:36  oes
+# - added depandancy of filters.o on cgi.h
+#
+# Revision 1.12  2001/06/12 17:15:56  swa
+# fixes, because a clean build on rh6.1 was impossible.
+# GZIP confuses make, %configure confuses rpm, etc.
+#
+# Revision 1.11  2001/06/11 11:26:35  sarantis
+# RPM version should be the same as ijbswa version.  The rpm release is
+# specified in the specfile.
+#
+# Revision 1.10  2001/06/07 17:27:45  swa
+# added suse build section
+#
+# Revision 1.9  2001/06/04 18:31:58  swa
+# files are now prefixed with either `confdir' or `logdir'.
+# `make redhat-dist' replaces both entries confdir and logdir
+# with redhat values
+#
+# Revision 1.8  2001/06/04 10:44:57  swa
+# `make redhatr-dist' now works. Except for the paths
+# in the config file.
+#
+# Revision 1.7  2001/06/03 17:09:09  swa
+# swa for oes: reversed my earlier change
+#
+# Revision 1.6  2001/06/03 17:07:27  swa
+# swa for oes
+#
+# Revision 1.5  2001/06/03 13:57:26  swa
+# compile cgi.c (for andreas' GUI)
+#
+# Revision 1.4  2001/05/31 21:18:45  jongfoster
+# Added files actions.[ch], actionlist.h, list.[ch] to Makefile
+#
+# Revision 1.3  2001/05/29 20:02:48  joergs
+# Changes for AmigaOS added.
+#
+# Revision 1.2  2001/05/17 22:23:23  oes
+#  - Added auto-generation of CRLFs for Win32 config files
+#  - Added comment-prefix to all Win32-only options in the config file
+#    and provided auto stripping of this prefix for the Win32 platform by make
+#
+# Revision 1.1.1.1  2001/05/15 13:59:00  oes
+# Initial import of version 2.9.3 source tree
+#
+#