# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.109 2002/05/28 09:16:15 oes Exp $
+# $Id: GNUmakefile.in,v 1.120 2002/10/10 20:39:27 dessent Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
CODE_STATUS = @CODE_STATUS@
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
RPM_VERSION = $(VERSION)
+RPM_PACKAGEV = ""
+SNAPVERSION = $(RPM_VERSION)-$(shell date "+%Y%m%d")
#############################################################################
# Directories for "make install"
#############################################################################
-DEST = @prefix@
-CONFDEST = @prefix@@sysconfdir@
-SBIN_DEST = @prefix@@sbindir@
-MAN_DEST = @prefix@@mandir@
-DOK_WEB_USEM = doc/webserver/user-manual
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+CONF_BASE = @sysconfdir@
+SBIN_DEST = @sbindir@
+MAN_DIR = @mandir@
+MAN_DEST = $(MAN_DIR)/man1
+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/
#############################################################################
# Build tools
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
+INSTALL_P = -m 0755
+INSTALL_T = -m 0644
+INSTALL_D = -m 0755 -d
+# install options for superuser install
+#INSTALL_S = -g @GROUP@ -o @USER@
+ID = id -u
LD = @CC@
RM = rm -f
+RMDIR = rmdir
+MKDIR = ./mkinstalldirs
STRIP_PROG = strip
SED = sed
+GREP = grep
CAT = cat
RPM = rpm
MV = mv
TAR = tar
LN = ln
+TOUCH = touch
+KILL = kill
+CHMOD = chmod
+CHOWN = chown
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) -ihtml -t sgml -D.. -d ldp.dsl\#html
+DB = $(JADEBIN) $(JADECAT) -i$(DOC_STATUS) -ihtml -t sgml -D.. -d ldp.dsl\#html
MAN2HTML = @MAN2HTML@
G2H_CMD = groff -mandoc -Thtml
TARGET_OS = @host@
PERL = perl
DOC_DIR = doc/source
DOC_TMP = $(DOC_DIR)/tmp
-
+DKPREFIX = @DKPREFIX@
#User Group paras
USER = @USER@
# and escape every '#' in the find. doh.
CONFIG_FILES = config trust \
default.action \
- basic.action intermediate.action advanced.action \
+ standard.action user.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 "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \
`find doc/webserver/ -name "*.css"` \
privoxy.1
$(DIR_PRIVOXY_SRC)/urlmatch.c
C_OBJS = $(C_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@)
-C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h
+C_HDRS = $(C_SRC:.c=.h) $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/actionlist.h
W32_SRC = @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.c $(DIR_PRIVOXY_SRC)/w32taskbar.c $(DIR_PRIVOXY_SRC)/win32.c
W32_FILES = @WIN_ONLY@$(DIR_PRIVOXY_OBJ)/w32res.res
REGEX_SRC =
@STATIC_PCRE_ONLY@REGEX_SRC = $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.c
-REGEX_OBJS = $(REGEX_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=%.@OBJEXT@)
+REGEX_OBJS = $(REGEX_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@)
REGEX_HDRS = $(REGEX_SRC:.c=.h)
# Dependencies introduced by #include "project.h".
#
# 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 \
+.PHONY: all inifiles redhat-dist redhat-upload redhat-test 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
+debian-upload ensure-wdump ensure-jadebin ensure-dkprefix CONF_DEST LOG_DEST \
+PID_DEST check_doc install-strip
#############################################################################
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
$(DIR_PRIVOXY_OBJ):
- mkdir obj
+ $(MKDIR) obj
+
+#############################################################################
+# Strip master copy comments from default.action:
+#############################################################################
+default.action: default.action.master
+ $(GREP) -v '^#MASTER#' $< > $@
#############################################################################
# Win32 config files
trust.txt: trust
$(DOSFILTER) < $< > $@
-re_filterfile.txt: re_filterfile
- $(DOSFILTER) < $< > $@
-
-
#############################################################################
# Pre-dist check:
#############################################################################
if [ "$$answer" != "yes i am sure" ]; then exit 1; fi \
fi;
+#############################################################################
+# create tar.gz from CVS:
+# This make-target is usually called through 'create-archive'. If you
+# 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 and spec-file for a Red Hat 6.x version.
+#############################################################################
+create-snapshot:
+ @tag=`cvs -d $(CVSROOT) status Makefile | awk ' /Sticky Tag/ { print $$3 } '` 2> /dev/null; \
+ [ x"$$tag" = x"(none)" ] && tag=HEAD; \
+ echo "*** Creating package from $$tag!"; \
+ cd $(TMPDIR) ; cvs -Q -d $(CVSROOT) export -r $$tag current || echo "Um... export aborted."
+ @cd $(TMPDIR)/current; \
+ TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \
+ if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \
+ -e 's/^\(Release:\).*/\1 $(SNAPVERSION)/g' \
+ privoxy-rh.spec > $$TMPFILE ; then \
+ $(MV) -f $$TMPFILE privoxy-rh.spec; \
+ else \
+ $(ECHO) "Could not set version info in specfile."; \
+ exit 1;\
+ fi;\
+ if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \
+ -e 's/^\(Release:\).*/\1 $(SNAPVERSION)/g' \
+ privoxy-suse.spec > $$TMPFILE ; then \
+ $(MV) -f $$TMPFILE privoxy-suse.spec; \
+ else \
+ $(ECHO) "Could not set version info in specfile."; \
+ exit 1;\
+ fi; \
+ $(RM) $(TMPFILE); \
+ cd $(TMPDIR)/current; \
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude \
+ "privoxy-suse.spec" -czf $(TMPDIR)/$(PROGRAM)-rh-$(VERSION).tar.gz .; \
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude \
+ "privoxy-rh.spec" -czf $(TMPDIR)/$(PROGRAM)-suse-$(VERSION).tar.gz .
+ @$(MV) -f $(TMPDIR)/$(PROGRAM)-rh-$(VERSION).tar.gz .
+ @$(MV) -f $(TMPDIR)/$(PROGRAM)-suse-$(VERSION).tar.gz .
+ @$(RM) -rf $(TMPDIR)
+ @echo "Resulting files are $(PROGRAM)-rh-$(VERSION).tar.gz and"
+ @echo " $(PROGRAM)-suse-$(VERSION).tar.gz"
+
+
+#############################################################################
+# 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. Two different tar files will be written, one for
+# Red Hat and one for SuSe (different spec-files)
+#############################################################################
+create-archive:
+ make SNAPVERSION=$(SNAPVERSION) create-snapshot
+
#############################################################################
-# RPM specifice stuff (SuSE or Redhat, ..)
+# RPM specific stuff (SuSE or Redhat, ..)
#############################################################################
rpm-stuff: dist-check clean clobber
for dir in RPMS SRPMS BUILD SOURCES SPECS; do \
# redhat distribution alpha and x86
#############################################################################
redhat-dist: rpm-stuff
+ echo $(CONFIG_FILES)
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
+ $(RPMBUILD) --clean -ta $(TAR_ARCH)
+ if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
+# For testing build issues only! Use redhat-dist for official releases.
+redhat-test:
+ echo $(CONFIG_FILES)
$(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
- $(RPM) --clean -ta $(TAR_ARCH)
+ $(RPMBUILD) --clean -tb $(TAR_ARCH)
if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
+ @echo "WARNING: This target is only for testing. Use redhat-dist for releases!!!"
# anonymously ncftps the rpms to sourceforge
redhat-upload: check-release
$(RM) /usr/sbin/rcprivoxy
$(RM) /usr/share/man/man1/privoxy.1.gz
+
#############################################################################
# generic distribution
#############################################################################
#
#############################################################################
-# 3 checks to make sure docs will be generated
-ensure-wdump:
-ifeq (@WDUMP@,false)
- @$(ECHO)
- @$(ECHO) "Cannot build docs; one of w3m, links, or lynx must be installed."
- @$(ECHO) "You should install the appropriate package and rerun ./configure"
- @exit 1
-endif
-
-ensure-jadebin:
-ifeq (@JADEBIN@,false)
- @$(ECHO)
- @$(ECHO) "Cannot build docs; one of openjade or jade must be installed"
- @$(ECHO) "You should install the appropriate package and rerun ./configure"
- @exit 1
-endif
-
-ensure-dkprefix:
-ifeq (@DKPREFIX@,false)
- @$(ECHO)
- @$(ECHO) "Cannot build docs; cannot find docbook-dsssl stylesheets"
- @$(ECHO) "You should install the appropriate package and rerun ./configure"
- @exit 1
-endif
-
-# developer manual
-dok-devel: ensure-dkprefix ensure-jadebin ensure-wdump
- $(RM) doc/webserver/developer-manual/*.html
- $(RM) -r doc/source/developer-manual
- mkdir -p doc/text doc/source/developer-manual
- cd doc/source/developer-manual && $(DB) ../developer-manual.sgml && cd .. && cp developer-manual/*.html ../webserver/developer-manual/
- cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/developer-manual.txt && $(RM) -r tmp.html developer-manual
-
-# user manual
-dok-user: ensure-dkprefix ensure-jadebin ensure-wdump
- $(RM) doc/webserver/user-manual/*.html
- $(RM) -r doc/source/user-manual/
- mkdir -p doc/text doc/source/user-manual
- cd doc/source/user-manual && $(DB) ../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) -r tmp.html user-manual
-
-# faq
-dok-faq: ensure-dkprefix ensure-jadebin ensure-wdump
- $(RM) doc/webserver/faq/*.html
- $(RM) -r doc/source/faq
- mkdir -p doc/text doc/source/faq
- cd doc/source/faq && $(DB) ../faq.sgml && cd .. && cp faq/*.html ../webserver/faq/
- cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) tmp.html > ../text/faq.txt && $(RM) -r tmp.html faq
-
-# man page
-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 ./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: ensure-dkprefix ensure-jadebin ensure-wdump
- cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
- $(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html
-
-# 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 consumers reduce unwanted junk email and protect their privacy from direct marketing companies.\"><\/HEAD/;\
- s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
- s/\.\d\. //'\
- 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 consumers reduce unwanted junk email and protect their privacy from direct marketing companies.\"><\/HEAD/;\
- s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/;\
- s/\.\d\. //'\
- doc/webserver/privoxy-index.html && $(RM) doc/webserver/*.bak
-
-# Main documentation target.
-dok: dok-devel dok-release dok-user dok-faq dok-readme dok-webserver dok-authors dok-index
- @$(ECHO) Documentation created.
-
-#
-# an alternative to the above dok. disabled man page creation for the moment
-#
-redhat-dok: dok-release dok-devel dok-user dok-faq redhat-readme dok-webserver dok-authors
- @$(ECHO) Documentation created.
-
-# 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 \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) ./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
-
-## Make README
-redhat-readme: ensure-dkprefix ensure-jadebin ensure-wdump
- cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \
- tmp.html > ../../README && $(RM) -r tmp.html
-
-## Make AUTHORS file
-dok-authors: ensure-dkprefix ensure-jadebin ensure-wdump
- cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \
- tmp.html > ../../AUTHORS && $(RM) tmp.html
-
-# 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:
- 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
-
-# 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
-
-dok-pdf: dok-release
- $(RM) doc/pdf/*.pdf
- cp -f doc/source/*.sgml doc/pdf
- cp -f doc/source/*.dsl doc/pdf
- cd doc/pdf && db2pdf --pdf -s ldp.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf > /dev/null 2>&1
- cd doc/pdf && db2pdf --pdf -s ldp.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf > /dev/null 2>&1
- cd doc/pdf && db2pdf --pdf -s ldp.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf > /dev/null 2>&1
- $(RM) doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux
-
-# the layout and style with db2pdf sucks, here is an alternative
-dok-pdf2: dok-release
- mkdir -p doc/source/temp # this directory not in cvs
- cd doc/source && $(DB) -V nochunks user-manual.sgml > temp/privoxy-user-manual.html
- cd doc/source && $(DB) -V nochunks developer-manual.sgml > temp/privoxy-developer-manual.html
- cd doc/source && $(DB) -V nochunks faq.sgml > temp/privoxy-faq.html
-# one could use html2ps and ps2pdf. well, that does not work. htmlps produces incorrect output.
-
-# 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)
+
+dok:
+ cd $(DOC_DIR) && $(MAKE)
#############################################################################
#
@$(ECHO) it will not remove obsolete documents.
@$(ECHO) -------------------------------------------------------
- @$(ECHO) Uploading
+ @$(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'
+ @$(ECHO) Uploading pdf
+ @cd doc/pdf;\
+ zip privoxy-pdf-docs *.pdf ;\
+ scp -q privoxy-pdf-docs.zip ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/pdf
+
@$(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'
$(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
# PCRS
-$(DIR_PRIVOXY_OBJ)/pcrs.@OBJEXT@: $(DIR_PRIVOXY_SRC)/pcrs.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC)/pcrs.h
+$(DIR_PRIVOXY_OBJ)/pcrs.@OBJEXT@: $(DIR_PRIVOXY_SRC)/pcrs.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/config.h
# 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
# 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)/chartables.c: $(DIR_PRIVOXY_OBJ)/dftables@EXEEXT@
$(DIR_PRIVOXY_SRC_PCRE)/dftables@EXEEXT@ >$(DIR_PRIVOXY_SRC_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
# 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)/w32log.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/w32log.c $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/w32taskbar.h $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h
+$(DIR_PRIVOXY_OBJ)/win32.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/win32.c $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h
+$(DIR_PRIVOXY_OBJ)/w32taskbar.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/w32taskbar.c $(DIR_PRIVOXY_SRC)/w32taskbar.h
$(DIR_PRIVOXY_OBJ)/w32res.res: $(DIR_PRIVOXY_SRC)/w32res.rc \
$(DIR_PRIVOXY_SRC)/w32res.h \
$(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`
tidy:
$(RM) `find . -name "*~"`
$(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/source/ldp.dsl
+ $(RM) GNUmakefile configure src/config.h.in src/config.h config.cache config.status config.log logfile \
+ privoxy.log core *.tar.gz *.tar privoxy-cl.spec $(DOC_DIR)/ldp.dsl \
+ $(DOC_DIR)/GNUmakefile
#
# FIXME: What is all this?
tags: $(SRCS) $(HDRS)
etags $(SRCS) $(HDRS)
-install: all
+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)
+
+install-strip:
+ $(MAKE) INSTALL_P='$(INSTALL_P) -s' install
+
+install: CONF_DEST LOG_DEST PID_DEST check_doc all
#
- # FIXME: This is a dirty hack to have an install target
- # that works at least for some setups. This needs
- # to be fixed!
+ # FIXME: test this in all systems and with several options and report any bugs
#
- $(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)
+
+ $(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(SHARE_DEST) $(MAN_DEST) $(LOG_DEST) $(PID_DEST)
+
+ # Install the executable binary
$(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
+
+ $(INSTALL) $(INSTALL_D) $(CONF_DEST)
+ $(INSTALL) $(INSTALL_D) $(CONF_DEST)/templates
+
+ # Install the DOCS and man page
+ if [ $(check_doc) = 0 ]; then \
+ DOC=$(DOC_DEST) ;\
+ else \
+ DOC=$(prefix)/doc/privoxy ;\
+ fi;\
+ $(INSTALL) $(INSTALL_D) $$DOC ;\
+ $(INSTALL) $(INSTALL_D) $$DOC/user-manual ;\
+ $(INSTALL) $(INSTALL_D) $$DOC/faq ;\
+ $(INSTALL) $(INSTALL_D) $$DOC/images ;\
+ if [ -d "$(DOK_WEB)" ]; then \
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/user-manual/[^C]* $$DOC/user-manual;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/faq/[^C]* $$DOC/faq;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/images/*jpg $$DOC/images;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC;\
+ $(INSTALL) $(INSTALL_T) AUTHORS $$DOC;\
+ $(INSTALL) $(INSTALL_T) LICENSE $$DOC;\
+ $(INSTALL) $(INSTALL_T) README $$DOC;\
+ $(INSTALL) $(INSTALL_T) ChangeLog $$DOC;\
+ fi
+ -$(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz
+
+ # Change the Config file default directories acording to the configured ones
+ if [ -e config.base ] ; then \
+ $(CAT) config >config~ ;\
+ $(MV) config.base config ;\
+ fi
+ $(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \
+ $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated
+ $(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.
+ $(INSTALL) $(INSTALL_T) templates/[^C]* $(CONF_DEST)/templates
+ if [ `$(ID)` = 0 ] ;then\
+ if [ x$(USER) = x ]; then \
+ if [ `$(ID) privoxy` ]; then \
+ $(ECHO) -e "\n Setting user and group to privoxy";\
+ INSTALL_CONF="$(INSTALL_T) -b -g privoxy -o privoxy" ;\
+ else \
+ $(ECHO) -e "******************************************************************" ;\
+ $(ECHO) -e " WARNING! WARNING! installing config files as root!" ;\
+ $(ECHO) -e " It is strongly recommended to run $(PROGRAM) as non-root user," ;\
+ $(ECHO) -e " and to install the config files as that user!" ;\
+ $(ECHO) -e " Please read INSTALL, and create a privoxy user!" ;\
+ $(ECHO) -e "*******************************************************************" ;\
+ exit 1 ;\
+ fi ;\
+ else \
+ if [ x$(GROUP) = x ]; then \
+ $(ECHO) -e "\n Superuser install, installing config files as $(USER),$(USER)" ;\
+ INSTALL_CONF="$(INSTALL_T) -b -o $(USER) -g $(USER)" ;\
+ else \
+ $(ECHO) -e "\n Superuser install, installing config files as $(USER),$(GROUP)" ;\
+ INSTALL_CONF="$(INSTALL_T) -b -o $(USER) -g $(GROUP)" ;\
+ fi ;\
+ fi ;\
+ else \
+ if [ ! `$(ID) $(USER)` = `$(ID)` ] ;then \
+ $(ECHO) -e "\n ** WARNING ** current install user different from configured user!! edit may fail.\n" ;\
+ fi ;\
+ INSTALL_CONF="$(INSTALL_T) -b " ;\
+ fi ;\
+ $(INSTALL) $$INSTALL_CONF config default.action default.filter standard.action $(CONF_DEST) ;\
+ if [ ! -s "$(CONF_DEST)/user.action" ] ; then \
+ $(INSTALL) $$INSTALL_CONF user.action $(CONF_DEST) ;\
+ fi ;\
+ if [ ! -s "$(CONF_DEST)/trust" ] ; then \
+ $(INSTALL) $$INSTALL_CONF trust $(CONF_DEST) ;\
+ fi ;\
+
+ # setup the logfiles
+ # mode 0640 in the logs for privacy reasons
+ $(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile
+ -$(CHOWN) $(USER),$(GROUP) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
+ $(ECHO) -e "\n ** WARNING ** current install user different from configured user!! Logging may fail\n"
+ -$(CHMOD) 0640 $(LOG_DEST)/logfile $(LOG_DEST)/jarfile
+
+ # Install the init and logrotate scripts. Test for Slackware and Red Hat only.
+ # Install if dest is writable.
+ 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)+' >slackware/rc.privoxy ;\
+ $(INSTALL) $(INSTALL_P) slackware/rc.privoxy /etc/rc.d/ ;\
+ $(ECHO) -e "\n Dont forget to add the rc.privoxy to rc.local if you want it started at every boot" ;\
+ elif [ -f /etc/redhat-release ] && [ -d /etc/rc.d/init.d/ ] && [ -w /etc/rc.d/init.d/ ] ; then \
+ $(INSTALL) $(INSTALL_P) privoxy.init /etc/rc./init.d/privoxy ;\
+ $(MKDIR) /etc/logrotate.d/ ;\
+ $(INSTALL) $(INSTALL_P) privoxy.logrotate /etc/logrotate.d/privoxy ;\
+ elif [ -d /etc/init.d ] && [ -w /etc/init.d ] ; then \
+ $(INSTALL) $(INSTALL_P) privoxy-generic.init /etc/init.d/privoxy ;\
+ else \
+ $(ECHO) -e "\n No init script installed, install it manually" ;\
+ fi
+
+uninstall: CONF_DEST LOG_DEST PID_DEST check_doc
+ #
+ # FIXME: test this in all systems and with several options and report any bugs
+ #
+
+ # KILL privoxy if running
+ -@ $(KILL) `$(CAT) $(PID_DEST)/privoxy.pid ` >/dev/nul 2>/dev/null
+ -@ $(KILL) `$(CAT) /var/run/privoxy.pid ` >/dev/nul 2>/dev/null
+
+ # Program binary
+ $(RM) $(SBIN_DEST)/$(PROGRAM) $(SBIN_DEST)/$(PROGRAM)~
+
+ # config files and dir and maybe old install backups
+ $(RM) $(CONF_DEST)/config $(CONF_DEST)/default.action $(CONF_DEST)/default.filter \
+ $(CONF_DEST)/trust $(CONF_DEST)/standard.action $(CONF_DEST)/user.action \
+ $(CONF_DEST)/config~ $(CONF_DEST)/default.action~ $(CONF_DEST)/default.filter~ \
+ $(CONF_DEST)/trust~ $(CONF_DEST)/standard.action~ $(CONF_DEST)/user.action~
+ $(RM) -r $(CONF_DEST)/templates
+ -$(RMDIR) $(CONF_DEST) || $(ECHO) -e " $(CONF_DEST) is not empty, couldnt remove it\n" ;\
+
+ # man page and docs
+ -$(RM) $(MAN_DEST)/privoxy.1.gz
+ -$(RM) -r $(DOC_DEST) || $(RM) -r $(prefix)/doc/privoxy
+
+ # Log and jarfile and pidfile
+ -$(RM) $(LOG_DEST)/logfile || $(RM) /var/log/privoxy/logfile
+ -$(RM) $(LOG_DEST)/jarfile || $(RM) /var/log/privoxy/jarfile
+ -$(RM) $(PID_DEST)/privoxy.pid || $(RM) /var/run/privoxy.pid
+
+ # final clean up of unused directories
+ if [ ! "$(prefix)" = "/usr/local" ] ;then \
+ $(RMDIR) $(MAN_DEST) || $(ECHO) -e " $(MAN_DEST) is not empty, couldnt remove it\n" ;\
+ $(RMDIR) $(MAN_DIR) || $(ECHO) -e " $(MAN_DIR) is not empty, couldnt remove it\n" ;\
+ $(RMDIR) $(SHARE_DEST)/doc || $(ECHO) -e " $(SHARE_DEST)/doc is not empty, couldnt remove it\n" ;\
+ $(RMDIR) $(SHARE_DEST) || $(ECHO) -e " $(SHARE_DEST) is not empty, couldnt remove it\n" ;\
+ $(RMDIR) $(CONF_BASE) || $(ECHO) -e " $(CONF_BASE) is not empty, couldnt remove it\n" ;\
+ $(RMDIR) $(SBIN_DEST) || $(ECHO) -e " $(SBIN_DEST) is not empty, couldnt remove it\n" ;\
+ $(RMDIR) $(LOG_DEST) || $(ECHO) -e " $(LOG_DEST) is not empty, couldnt remove it\n" ;\
+ $(RMDIR) $(prefix) || $(ECHO) -e " $(prefix) is not empty, couldnt remove it\n" ;\
+ fi
+ # init scripts and logrotate
+ if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
+ $(RM) /etc/rc.d/rc.privoxy ;\
+ elif [ -f /etc/redhat-release ] && [ -d /etc/rc.d/init.d/ ] && [ -w /etc/rc.d/init.d/ ] ; then \
+ $(RM) /etc/rc.d/init.d/privoxy /etc/logrotate.d/privoxy;\
+ elif [ -d /etc/init.d ] && [ -w /etc/init.d ] ; then \
+ $(RM) /etc/init.d/privoxy ;\
+ else \
+ $(ECHO) -e "\n Unable to remove privoxy init script... not installed or permition denied" ;\
+ fi
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,\
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.120 2002/10/10 20:39:27 dessent
+#
+#
+# Fixes for Win32 GUI build (added "$(DIR_PRIVOXY_SRC)/" to dependencies list)
+#
+# Revision 1.119 2002/09/23 03:42:41 hal9
+# This is higuita's make install/uninstall patch. Needs testing please!!!
+#
+# Revision 1.118 2002/09/11 08:22:37 oes
+# Fixed path (C_HDRS are in src/ now)
+#
+# Revision 1.117 2002/09/06 23:33:35 hal9
+# Fix clobber for config.h and config.h.in are in src now.
+#
+# Revision 1.116 2002/09/06 05:22:57 hal9
+# Adapt make webserver target to 3.0 for pdf uploading.
+#
+# Revision 1.115 2002/09/05 19:13:04 hal9
+# Migrate Karstens make snapshot stuff (not tested).
+#
+# Revision 1.114 2002/09/05 11:58:30 oes
+# Synced in some changes fromm the stable branch:
+# From Revision 1.104.2.14 2002/08/10 11:19:37 oes:
+# - Add dependency: pcrs.o deps on config.h
+# Revision 1.104.2.9 2002/07/26 15:17:02 oes
+# - Added generation of default.action from defaul.action.master
+# - Deleted obsolete re_filterfile.txt generation
+#
+# Revision 1.113 2002/07/30 21:50:25 hal9
+# Add redhat-test target, and migrate the RPM_PACKAGEV stuff from 3.0 branch.
+#
+# Revision 1.112 2002/06/28 18:30:10 jongfoster
+# Fixing bugs compiling PCRE
+#
+# Revision 1.111 2002/06/05 00:26:21 hal9
+# Move all doc build stuff to doc/source/GNUmakefile, leaving a 'make dok'
+# target only in toplevel. Add DOC_STATUS variable so docs can be built without
+# touching sgml source.
+#
+# Revision 1.110 2002/06/04 14:51:48 jongfoster
+# Updating for new paths:
+# - Source files in src/
+# - Object files in obj/
+#
# Revision 1.109 2002/05/28 09:16:15 oes
# Added comment for -notoc kludge
#
projects / privoxy.git / blobdiff