# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.110 2002/06/04 14:51:48 jongfoster Exp $
+# $Id: GNUmakefile.in,v 1.195 2011/01/22 12:33:11 fabiankeil Exp $
#
-# Written by and Copyright (C) 2001 the SourceForge
+# Written by and Copyright (C) 2001-2010 members of the
# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
VERSION_POINT = @VERSION_POINT@
CODE_STATUS = @CODE_STATUS@
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
-RPM_VERSION = $(VERSION)
+SNAPVERSION = $(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@
-DEST = @prefix@
-CONFDEST = @prefix@@sysconfdir@
-SBIN_DEST = @prefix@@sbindir@
-MAN_DEST = @prefix@@mandir@
-DOK_WEB_USEM = doc/webserver/user-manual
+datarootdir = @datarootdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+CONF_BASE = @sysconfdir@
+SBIN_DEST = @sbindir@
+MAN_DIR = @mandir@
+MAN_DEST = $(MAN_DIR)/man1
+MAN_PAGE = privoxy.1
+SHARE_DEST = @datadir@
+DOC_DEST = $(SHARE_DEST)/doc/privoxy
+VAR_DEST = @localstatedir@
+LOGS_DEST = $(VAR_DEST)/log/privoxy
+PIDS_DEST = $(VAR_DEST)/run
+
+# if $prefix = /usr/local then the default CONFDEST change from
+# CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy
+# by the target rule CONF_DEST
+#
+# also if the $prefix is /usr/local and there is no
+# $(SHARE_DEST)/doc, it checks for $prefix/doc and installs there
+# instead in this situation
+#
+# finally if $prefix=/usr/local and VAR_DEST=$prefix/var it
+# changes this to /var for storing the logs and pidfile
+
+# 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
CC = @CC@
ECHO = echo
GZIP_PROG = gzip
-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
+
+# 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
-SED = sed
+SED = sed
+GREP = grep
CAT = cat
-RPM = rpm
-MV = mv
+MV = mv
TAR = tar
LN = ln
+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_TMP = $(DOC_DIR)/tmp
-
-
-#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)
+# If your SF user name differs from your local one,
+# change this to "ssh -l sf-username"
+SSH = ssh
#############################################################################
-# Setup for make distribution rh and suse for now
+# Setup for make distribution for now.
#############################################################################
-TAR_ARCH = /tmp/privoxy-$(RPM_VERSION).tar.gz
-RPM_BASE = @RPM_BASE@
+TAR_ARCH = /tmp/privoxy-$(VERSION).tar.gz
#############################################################################
# We include these files in our distributions
#############################################################################
+CONFIGS = config trust default.action match-all.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.
-CONFIG_FILES = config trust \
- default.action \
- standard.action user.action \
- default.filter \
+CONFIG_FILES = $(CONFIGS) \
`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"` \
+DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \
`find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \
`find doc/webserver/ -name "*.css"` \
- privoxy.1
+ $(MAN_PAGE)
#############################################################################
# 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_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@$(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
+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=%.@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@
CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
@STATIC_PCRE_ONLY@ -Ipcre
-LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
+LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
#############################################################################
#
# There should NOT be any targets above this line.
#############################################################################
-all: $(PROGRAM)
+all: $(PROGRAM) default.action
#############################################################################
# Phony targets
#############################################################################
-.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
-
+.PHONY: all inifiles solaris-dist \
+win-dist tarball-dist dok webserver clean clobber tags \
+install 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)
+%.o: %.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-$(DIR_PRIVOXY_OBJ)/%.o: $(DIR_PRIVOXY_SRC_PCRE)/%.c $(DIR_PRIVOXY_OBJ)
- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-$(DIR_PRIVOXY_OBJ):
- mkdir obj
+#############################################################################
+# Strip master copy comments from default.action:
+#############################################################################
+default.action: default.action.master
+ $(GREP) -v '^#MASTER#' default.action.master > $@
#############################################################################
# Win32 config files
config.txt: config
$(SED) -e 's!\trustfile trust!trustfile trust.txt!' \
- -e 's!\jarfile jarfile!jarfile jar.log!' \
-e 's!\logfile logfile!logfile privoxy.log!' \
-e 's!#Win32-only: !!' \
< $< | \
trust.txt: trust
$(DOSFILTER) < $< > $@
-re_filterfile.txt: re_filterfile
- $(DOSFILTER) < $< > $@
-
-
#############################################################################
# Pre-dist check:
#############################################################################
#############################################################################
-# RPM specifice stuff (SuSE or Redhat, ..)
+# create tar.gz from CVS:
+# This make-target is usually called through 'create-archive'. If you
+# run 'make create-snapshot' without setting SNAPVERSION, you'll get a
+# tar.gz with the current date in the name and as a releasenumber in the
+# spec-file. But the main usage is to run it as follows (Red Hat example):
+# make SNAPVERSION=1.6x create-snapshot
+# This creates a tar.gz.
#############################################################################
-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."; \
- $(ECHO) "Or add a suitable path to .rpmmacros like."; \
- $(ECHO) "%_topdir /home/foo/rpm-build"; \
- exit 1; \
- fi; \
- done; \
-
-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 ""; \
- echo "ATTENTION: If your distribution use a specific tag on the"; \
- echo " release field (like \"cl\" for Conectiva, and"; \
- echo " \"mdk\" for Mandrake), DO NOT put it on the value"; \
- echo " given to RPM_PACKAGEV. It will be added automaticaly."; \
- echo " Do it like you would do for a redhat package,"; \
- echo " (i.e. just the number)."; \
- echo ; \
- exit 1; \
- fi
+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!"; \
+ TMPDIR=$(shell mktemp -d /tmp/$(PROGRAM).XXXXXX); \
+ cd $$TMPDIR ; cvs -Q -d $(CVSROOT) export -r $$tag current || echo "Um... export aborted."; \
+ 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"
#############################################################################
-# Create Conectiva specfile from RedHat specfile
-#############################################################################
-conectiva-spec:
- $(RM) privoxy-cl.spec
- chmod a+x genclspec.sh
- ./genclspec.sh
-
-#############################################################################
-# Conectiva distribution for x86
+# looks at the version of Makefile and exports a corresponding source-tree
+# example: if the Makefile has the sticky tag v_2_9_13, you'll get
+# privoxy-*-2.4.13.tar.gz.
#############################################################################
-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)
- if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
-
-conectiva-upload: check-release
- make redhat-upload RPM_PACKAGEV=$(RPM_PACKAGEV)cl
-
-#############################################################################
-# redhat distribution alpha and x86
-#############################################################################
-redhat-dist: rpm-stuff
-
- $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
- $(RPM) --clean -ta $(TAR_ARCH)
- if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
-
-# anonymously ncftps the rpms to sourceforge
-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/*/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
- @$(ECHO) -------------------------------------------------------
- @$(ECHO) Now goto
- @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
- @$(ECHO) ... and release the files.
- @$(ECHO) -------------------------------------------------------
- # w3m http://sourceforge.net/project/admin/editpackages.php?group_id=11118
-
-#############################################################################
-# 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" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
- $(RPM) --clean -ta $(TAR_ARCH)
- if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
-
-# anonymously ncftps the rpms to sourceforge
-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 $(RPM_BASE)/RPMS/*/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
- @$(ECHO) -------------------------------------------------------
- @$(ECHO) Now goto
- @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
- @$(ECHO) ... and release the files.
- @$(ECHO) -------------------------------------------------------
-
-# handle with care. use with root.
-suse-clean:
- $(RPM) -e junkbuster-suse || true
- $(RM) -r /etc/junkbuster
- $(RM) -r /etc/rc.d/junkbuster*
- $(RM) -r /var/run/junkbuster.pid
- $(RM) -r /var/log/junkbuster
- $(RM) /etc/init.d/junkbuster
- $(RM) /usr/sbin/junkbuster
- $(RM) /usr/sbin/rcjunkbuster
- $(RM) /usr/share/man/man1/junkbuster.1.gz
- $(RPM) -e privoxy-suse || true
- $(RM) -r /etc/privoxy
- $(RM) -r /etc/rc.d/privoxy*
- $(RM) -r /var/run/privoxy.pid
- $(RM) -r /var/log/privoxy
- $(RM) /etc/init.d/privoxy
- $(RM) /usr/sbin/privoxy
- $(RM) /usr/sbin/rcprivoxy
- $(RM) /usr/share/man/man1/privoxy.1.gz
+create-archive:
+ make SNAPVERSION=$(SNAPVERSION) create-snapshot
#############################################################################
# generic distribution
ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar.gz
@$(ECHO) -------------------------------------------------------
@$(ECHO) Now goto
- @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+ @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118
@$(ECHO) ... and release the files.
@$(ECHO) -------------------------------------------------------
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) Creating Debian package. Will exist in parent directory.
- dpkg-buildpackage -rfakeroot -us -uc
-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) -------------------------------------------------------
-
-
-#############################################################################
-# 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
-#############################################################################
-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
-
-
#############################################################################
# Tarball distribution: No CVS dirs, dotfiles, debian build dir,
# (FIXME:) only parts of the static / generated docs mix in doc/webserver
$(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" \)`; do \
files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
done && \
cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
@$(ECHO) -------------------------------------------------------
@$(ECHO) Now goto
- @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+ @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118
@$(ECHO) ... and release the files.
@$(ECHO) -------------------------------------------------------
#
# Documentation
#
-# converts doc/source/*.sgml into html, text and man pages
+# converts doc/source/*.sgml into html and man pages
#
#############################################################################
-
-dok:
- cd $(DOC_DIR) && $(MAKE)
+# developer manual
+dok-devel:
+ $(RM) doc/webserver/developer-manual/*.html
+ $(RM) -r doc/source/developer-manual
+ mkdir -p doc/source/developer-manual
+ cd doc/source/developer-manual && $(DB) ../developer-manual.sgml && cd .. && cp developer-manual/*.html ../webserver/developer-manual/
+
+# user manual
+dok-user:
+ $(RM) doc/webserver/user-manual/*.html
+ $(RM) -r doc/source/user-manual/
+ mkdir -p doc/source/user-manual
+ cd doc/source/user-manual && $(DB) -iuser-man ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/
+ # FIXME: temp fix so same stylesheet gets in more than one place so it works
+ # for all doc set-ups, including the 'user manual' config option in local
+ # system where it MUST be in same directory as html.
+ $(PERL) -pi.bak -e 's/<\/head/\n<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"p_doc.css\">\n<\/head/i' doc/webserver/user-manual/*html
+
+# faq
+dok-faq:
+ $(RM) doc/webserver/faq/*.html
+ $(RM) -r doc/source/faq
+ mkdir -p doc/source/faq
+ cd doc/source/faq && $(DB) ../faq.sgml && cd .. && cp faq/*.html ../webserver/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) "<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 ./$(MAN_PAGE) | $(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
+
+# 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/ <URL:.*>//; s/\[ /\[/g' $(MAN_PAGE) ;\
+ perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \
+ perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \
+ perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(MAN_PAGE); \
+ perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' $(MAN_PAGE); \
+ perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' $(MAN_PAGE); \
+ $(DB) ../privoxy-man-page.sgml && $(MV) -f $(MAN_PAGE) ../../../$(MAN_PAGE)
+
+# For those with man2html ala RH7s.
+man2html:
+ mkdir -p doc/webserver/man-page
+ ifneq ($(MAN2HTML),false)
+ $(MAN2HTML) $(MAN_PAGE) |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
+# Twice because my version of man2html is pulling in commas and periods in URLs.
+ $(PERL) -pi.bak -e 's/(<A.*),(">)/$$1$$2/g' tmp.html
+ $(PERL) -pi.bak -e 's,\.">,">,g' tmp.html
+ $(PERL) -pi.bak -e "s/\['a\]/\á/g;s/\['e\]/\é/g" tmp.html
+# Get rid of spurious \a from conversion. (How to do this with perl?)
+ $(SED) -e 's/\a//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) ./$(MAN_PAGE) | $(SED) -e 's@</head>@<link REL="STYLESHEET" TYPE="text/css" HREF="../p_doc.css"></head>@' > 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<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
+ s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/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<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
+ s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/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.
+
+## 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/<!entity +p-version.*>/<!entity p-version "$(VERSION)">/;\
+ s/<!entity +p-status.*>/<!entity p-status "$(CODE_STATUS)">/' \
+ 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/<!entity +% +p-stable.*>/<!entity % p-stable "INCLUDE">/;\
+ s/<!entity +% +p-not-stable.*>/<!entity % p-not-stable "IGNORE">/' \
+ 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/<!entity +% +p-stable.*>/<!entity % p-stable "IGNORE">/;\
+ s/<!entity +% +p-not-stable.*>/<!entity % p-not-stable "INCLUDE">/' \
+ doc/source/*sgml doc/source/*/*sgml
+ $(RM) -r doc/source/*bak doc/source/*/*bak
+ endif
+
+# 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'.
+config-file: dok-release
+ cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
+ env -u LANG w3m -dump __tmp.html | fmt -w 70 > ../../config.new && $(RM) -r __tmp.*
+ $(PERL) -i.bak utils/prepare-configfile.pl 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 version 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
#############################################################################
#
#############################################################################
webserver: tidy
@$(ECHO) -------------------------------------------------------
- @$(ECHO) You have run make dok/redhat-dok before, right?
- @$(ECHO) Note that this command scps all stuff to the webserver,
- @$(ECHO) it will not remove obsolete documents.
+ @$(ECHO) You will need to "create" a SF shell first:
+ @$(ECHO) ssh -t SF-USER-ID,ijbswa@shell.sourceforge.net create
+ @$(ECHO) Please make sure your documentation files are up to date.
+ @$(ECHO) Note that this command updates the home page and copys
+ @$(ECHO) all stuff to the webserver, it will not remove obsolete documents.
+ @$(ECHO) Note that a botched upload can result in the documentation
+ @$(ECHO) on the website becoming unreachable! Also the CSS files
+ @$(ECHO) currently seem to end up at the wrong place.
@$(ECHO) -------------------------------------------------------
- @$(ECHO) Uploading
+ @$(ECHO) Replacing the user-manual symlink
+ @$(SSH) shell.sourceforge.net "cd /home/groups/i/ij/ijbswa/htdocs && rm user-manual \
+ && mkdir -p $(VERSION)/user-manual && ln -s $(VERSION)/user-manual user-manual"
+
+ @$(ECHO) Uploading html
@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'
+ $(TAR) cf - $$upload | $(SSH) shell.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'
-
+ @$(SSH) shell.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true'
+ @$(SSH) shell.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 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'
+ $(TAR) cf - $$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'
+ @$(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://www.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 urlmatch.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 urlmatch.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 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
+pcrs.@OBJEXT@: pcrs.c pcrs.h config.h @STATIC_PCRE_ONLY@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_SRC_PCRE)/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@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h pcrs.h project.h w32log.h w32taskbar.h win32.h
-$(DIR_PRIVOXY_OBJ)/w32taskbar.@OBJEXT@: w32taskbar.c config.h w32log.h w32taskbar.h
-$(DIR_PRIVOXY_OBJ)/win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h pcrs.h project.h w32log.h win32.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/radar-01.ico icons/radar-02.ico icons/radar-03.ico icons/radar-04.ico icons/radar-05.ico icons/radar-06.ico icons/radar-07.ico icons/radar-08.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) \
- `find . -name TAGS -o -name tags`
+ $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
+ `find . -name TAGS -o -name tags | $(GREP) -v .git` config.base config.tmp
tidy:
$(RM) `find . -name "*~"`
-# $(RM) `find . -name "#*#"` # what is this for??
+ $(RM) `find . -name "#*#"` # Emacs backup files
$(RM) `find . -name ".\#*"`
clobber: tidy
$(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \
- privoxy.log core *.tar.gz *.tar privoxy-cl.spec $(DOC_DIR)/ldp.dsl \
- $(DOC_DIR)/GNUmakefile
+ privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl config.new
+ $(RM) -r autom4te.cache
#
# FIXME: What is all this?
tags: $(SRCS) $(HDRS)
etags $(SRCS) $(HDRS)
-install: all
- #
- # FIXME: This is a dirty hack to have an install target
- # that works at least for some setups. This needs
- # to be fixed!
- #
- $(STRIP_PROG) $(PROGRAM)
- $(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
-
-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,\
- 239,78,241,110,234,1,28,160,171,152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,143,\
- 13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,69,253,36,102,81,49,83,236,19,225,171,131,\
- 214,172,163,73,4,168,123,115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,187,54,220,125,\
- 193,51,228,11,1,0,0);'|zcat
+CONF_DEST:=$(shell if [ "$(prefix)" = "/usr/local" ] && [ "$(CONF_BASE)" = "$(prefix)/etc" ];then \
+ $(ECHO) "$(CONF_BASE)/privoxy";\
+ else\
+ $(ECHO) "$(CONF_BASE)";\
+ fi)
+
+LOG_DEST:=$(shell if [ "$(prefix)" = "/usr/local" ] && [ "$(LOGS_DEST)" = "$(prefix)/var/log/privoxy" ];then \
+ $(ECHO) "/var/log/privoxy" ;\
+ else\
+ $(ECHO) "$(LOGS_DEST)";\
+ fi)
+
+PID_DEST:=$(shell if [ "$(prefix)" = "/usr/local" ] && [ "$(PIDS_DEST)" = "$(prefix)/var/run" ];then \
+ $(ECHO) "/var/run" ;\
+ else\
+ $(ECHO) "$(PIDS_DEST)";\
+ fi)
+
+check_doc:=$(shell if [ ! -d "$(SHARE_DEST)/doc" ] && [ "$(prefix)" = "/usr/local" ] && [ -d "$(prefix)/doc" ];then \
+ $(ECHO) "1";\
+ else\
+ $(ECHO) "0";\
+ fi)
+
+# If USER is specified but no GROUP, assume there is a GROUP of same name.
+GROUP_T:=$(shell if [ x$(GROUP) = x ] && [ x$(USER) != x ];then \
+ $(ECHO) "$(USER)" ;\
+ else\
+ $(ECHO) "$(GROUP)";\
+ fi)
+
+install-strip:
+ $(MAKE) install STRIP=-s
+
+# FIXME: Test USER and GROUP on Slack to make sure this works as
+# intended.
+#
+# 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, 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. 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) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) \
+ $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
+ $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
+ @# 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 $(DESTDIR)$(SBIN_DEST)
+ $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
+
+ @# Install the DOCS and man page. install-sh only does one file at a time.
+ @# FIXME: only handles jpegs.
+ -@if [ $(check_doc) = 0 ]; then \
+ DOC=$(DOC_DEST) ;\
+ else \
+ DOC=$(prefix)/doc/privoxy ;\
+ fi;\
+ $(MKDIR) $(DESTDIR)$$DOC $(DESTDIR)$$DOC/user-manual $(DESTDIR)$$DOC/faq $(DESTDIR)$$DOC/developer-manual \
+ $(DESTDIR)$$DOC/man-page $(DESTDIR)$$DOC/images $(DESTDIR)$(MAN_DEST) ;\
+ if [ -d "$(DOK_WEB)" ]; then \
+ $(ECHO) Installing FAQ, Manual, and other docs to $(DESTDIR)$$DOC;\
+ for i in user-manual developer-manual faq; do \
+ for ii in $(DOK_WEB)/$$i/*html; do \
+ $(INSTALL) $(INSTALL_T) $$ii $(DESTDIR)$$DOC/$$i;\
+ done ;\
+ done ;\
+ for i in $(DOK_WEB)/user-manual/*jpg; do \
+ $(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$$DOC/user-manual;\
+ done ;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $(DESTDIR)$$DOC/man-page;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\
+ $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC/user-manual;\
+ fi
+ @# Not all platforms support gzipped man pages.
+ @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/$(MAN_PAGE)
+ -$(INSTALL) $(INSTALL_T) $(MAN_PAGE) $(DESTDIR)$(MAN_DEST)/$(MAN_PAGE)
+
+ @# 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.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 $(DESTDIR)$(CONF_DEST)/templates
+ @for i in `find templates -type f`; do \
+ $(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
+ done
+
+ @# 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 [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \
+ if [ "`$(ID) privoxy`" ] && \
+ $(GROUPS) privoxy | $(SED) 's/^.*://' |$(GREP) "\<privoxy\>" >/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 \
+ 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_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_R)" ;\
+ fi ;\
+ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
+ for i in $(CONFIGS); do \
+ if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
+ $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+ $(ECHO) Installing fresh $$i;\
+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+ elif [ -s "$(CONF_DEST)/$$i" ]; then \
+ $(ECHO) Installing $$i as $$i.new ;\
+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+ NEW=1;\
+ else \
+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+ fi ;\
+ done ;\
+ if [ -n "$$NEW" ]; then \
+ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
+ $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
+ fi ;\
+ [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
+ $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
+ $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
+ if [ x$$USER != x ]; then \
+ $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
+ $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
+ fi ;\
+ if [ x$$GROUP_T != x ]; then \
+ $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \
+ $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
+ fi ;\
+ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || 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+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\
+ $(INSTALL) $(INSTALL_P) slackware/rc.privoxy $(DESTDIR)/etc/rc.d/ ;\
+ $(ECHO) "Installing for Slackware." ;\
+ $(ECHO) "Dont forget to add the rc.privoxy to rc.local if you want it started at every boot" ;\
+ elif [ -d $(DESTDIR)/etc/init.d ] && [ -w $(DESTDIR)/etc/init.d ] ; then \
+ $(ECHO) "Installing generic init script to $(DESTDIR)/etc/init.d/privoxy" ;\
+ $(ECHO) "Please check that the PATHs are correct, and edit if needed." ;\
+ $(INSTALL) $(INSTALL_P) privoxy-generic.init $(DESTDIR)/etc/init.d/privoxy ;\
+ fi ;\
+ else \
+ $(ECHO) "No init script installed, install it manually if needed" ;\
+ fi
+ $(RM) config.base config.tmp
+ @# mmmmm, good.
+ @$(ECHO) "$(PROGRAM_V) installation succeeded!"
+ @$(ECHO) "The Privoxy configuration files have been installed in $(DESTDIR)$(CONF_DEST)"
+
+# rmdir is used as a precaution since it will not remove non-empty
+# 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
+ @# XXX: the chkconfig line may need a DESTDIR prefix.
+ -@test -f $(DESTDIR)$(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\
+ $(KILL) `$(CAT) $(DESTDIR)$(PID_DEST)/privoxy.pid` || :
+ -@test -f $(DESTDIR)/var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\
+ $(KILL) `$(CAT) $(DESTDIR)/var/run/privoxy.pid ` || :
+
+ @# Program binary
+ @$(ECHO) Removing $(PROGRAM) binary
+ $(RM) $(DESTDIR)$(SBIN_DEST)/$(PROGRAM) $(SBIN_DEST)/$(PROGRAM)~
+
+ @# config files and dir, and maybe old install backups
+ -@if [ -d $(DESTDIR)$(CONF_DEST) ]; then \
+ $(ECHO) Saving $(PROGRAM) config files to $(DESTDIR)/tmp/$(PROGRAM)-save ;\
+ $(MKDIR) $(DESTDIR)/tmp/$(PROGRAM)-save ;\
+ cd $(DESTDIR)$(CONF_DEST) ;\
+ for i in $(DESTDIR)$(CONFIGS); do \
+ [ -f $$i ] && $(CP) $$i $(DESTDIR)/tmp/$(PROGRAM)-save ;\
+ done ;\
+ fi
+ @$(ECHO) Removing $(PROGRAM) config files
+ -@for i in $(DESTDIR)$(CONFIGS); do \
+ test -f $(CONF_DEST)/$$i && $(ECHO) Removing $$i ;\
+ $(RM) $(DESTDIR)$(CONF_DEST)/$$i $(DESTDIR)$(CONF_DEST)/$$i~ $(DESTDIR)$(CONF_DEST)/$$i.new ;\
+ done
+ -@test -d $(DESTDIR)$(CONF_DEST)/templates && $(RM) -r $(DESTDIR)$(CONF_DEST)/templates &&\
+ $(ECHO) "Removing $(DESTDIR)$(CONF_DEST)/templates/*"
+
+ @# man page and docs
+ @$(ECHO) Removing $(PROGRAM) docs
+ -$(RM) $(DESTDIR)$(MAN_DEST)/$(MAN_PAGE)*
+ -$(RM) -r $(DESTDIR)$(DOC_DEST) || $(RM) -r $(DESTDIR)$(prefix)/doc/privoxy
+
+ @# Log and pidfile
+ @$(ECHO) Removing $(PROGRAM) logs
+ -$(RM) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(PID_DEST)/privoxy.pid
+
+ @# Final clean up of unused directories. Special handling of CONF and LOG
+ # destinations.
+ @$(ECHO) Removing $(PROGRAM) directories
+ @for i in $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(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 \
+ for i in $(DESTDIR)$(MAN_DEST) $(DESTDIR)$(MAN_DIR) $(DESTDIR)$(SHARE_DEST)/doc \
+ $(DESTDIR)$(SHARE_DEST) $(DESTDIR)$(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 $(DESTDIR)$(prefix)/var/log; then \
+ $(ECHO) Removing $(DESTDIR)$(prefix)/var/log ;\
+ $(RMDIR) $(DESTDIR)$(prefix)/var/log || $(ECHO) "$(DESTDIR)$(prefix)/var/log is not empty, not removed";\
+ fi ;\
+ if test $(PID_DEST) != /var/run && test -d $(DESTDIR)$(prefix)/var/run; then \
+ $(ECHO) Removing $(DESTDIR)$(prefix)/var/run ;\
+ $(RMDIR) $(DESTDIR)$(prefix)/var/run || $(ECHO) "$(DESTDIR)$(prefix)/var/run is not empty, not removed";\
+ fi ;\
+ if test $(prefix)/var != /var && test -d $(DESTDIR)$(prefix)/var; then \
+ $(ECHO) Removing $(DESTDIR)$(prefix)/var ;\
+ $(RMDIR) $(DESTDIR)$(prefix)/var || $(ECHO) "$(DESTDIR)$(prefix)/var is not empty, not removed" ;\
+ fi ;\
+ if test $(prefix) != / && test $(prefix) != /usr && test -d $(DESTDIR)$(prefix); then \
+ $(ECHO) Removing $(DESTDIR)$(prefix) ;\
+ $(ECHO) Removing installation directory $(DESTDIR)$(prefix) ;\
+ $(RMDIR) $(DESTDIR)$(prefix) || $(ECHO) "$(DESTDIR)$(prefix) is not empty, not removed" ;\
+ fi;\
+ fi
-## Local Variables:
-## tab-width: 3
-## end:
+ @# init scripts
+ @if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
+ $(ECHO) Removing $(PROGRAM) init script ;\
+ if [ -f $(DESTDIR)/etc/slackware-version ] && \
+ [ -d $(DESTDIR)/etc/rc.d/ ] && [ -w $(DESTDIR)/etc/rc.d/ ] ; then \
+ $(RM) $(DESTDIR)/etc/rc.d/rc.privoxy ;\
+ elif [ -d $(DESTDIR)/etc/init.d ] && [ -w $(DESTDIR)/etc/init.d ] ; then \
+ $(RM) $(DESTDIR)/etc/init.d/privoxy ;\
+ else \
+ $(ECHO) "Unable to remove privoxy init script, not installed or permission denied" ;\
+ fi ;\
+ fi
+ @$(ECHO) Privoxy uninstalled, bye
-# $Log: GNUmakefile.in,v $
-# 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.104 2002/05/24 00:03:49 oes
-# Use p_doc.css for the Homepage for consistency
-#
-# Revision 1.103 2002/05/23 23:19:00 oes
-# Use dsl without TOC for the homepage
-#
-# Revision 1.102 2002/05/16 01:20:17 hal9
-# make announce target added.
-#
-# Revision 1.101 2002/05/15 12:28:46 oes
-# Trying to keep Hal happy :)
-#
-# Revision 1.100 2002/05/08 13:48:18 hal9
-# Ooops, that trashed JB v2.0.2 comment. Fixed.
-#
-# Revision 1.99 2002/05/08 13:42:07 hal9
-# This fixes the numbering problem on index.html in contact info section (.1.). Using
-# perl, since its way too convoluted to try to fix proper with docbook.
-#
-# Revision 1.98 2002/05/03 14:33:06 oes
-# Replaced ldp(OK).dsl handling with generation via autoconf; handle all file exeptions to src tarball via find
-#
-# Revision 1.97 2002/04/27 20:27:43 swa
-# no longer needed due to new
-# PACKAGE_VERSION process
-#
-# Revision 1.96 2002/04/27 17:44:32 morcego
-# - Correcting typo in my name (Rodrigo, not Rodgrigo) :-)
-# - Using the RM macro everywhere rm is called (either we use, or don't)
-# - Same for RPM
-#
-# Revision 1.95 2002/04/27 15:37:25 swa
-# replacing directory in document creation process
-# no longer necessary.
-#
-# Revision 1.94 2002/04/27 08:23:29 swa
-# pdf process reviewed and cleaned up
-#
-# Revision 1.93 2002/04/27 04:55:53 morcego
-# privoxy-cl.spec now gets removed by clobber target
-#
-# Revision 1.92 2002/04/27 04:53:40 morcego
-# Adding --exclude "PACKAGERS" to every tar command that applies (not for
-# webserver target)
-#
-# Revision 1.91 2002/04/27 04:44:51 morcego
-# GNUmakefile.in: The tarball created on redhat-dist and suse-dist now ignore
-# the PACKAGERS file, as well privoxy-cl.spec (in case it was created)
-# GNUmakefile.in: New targets -> conectiva-spec, conectiva-dist and
-# conectiva-upload
-# genclspec.sh : New file to generate, from privoxy-rh.spec, a specfile
-# for Conectiva Linux
-#
-# Revision 1.90 2002/04/26 17:46:53 swa
-# be consistent
-#
-# Revision 1.89 2002/04/26 17:20:54 swa
-# just produce single html files to proces them later with Destiller or somesuch. looks prettier.
-#
-# Revision 1.88 2002/04/25 19:13:57 morcego
-# Removed RPM release number declaration on configure.in
-# Changed makefile to use given value for RPM_PACKAGEV when on uploading
-# targets (will produce an error, explaining who to do it, if no value
-# if provided).
-#
-# 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
-#
-#
+coffee:
+ @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,' \
+ -e '101,0,109,143,205,13,192,32,8,133,239,78,241,110,234,1,28,160,171,' \
+ -e '152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,' \
+ -e '143,13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,' \
+ -e '69,253,36,102,81,49,83,236,19,225,171,131,214,172,163,73,4,168,123,' \
+ -e '115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,' \
+ -e '187,54,220,125,193,51,228,11,1,0,0);' | zcat
projects / privoxy.git / blobdiff