X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=fcd44c4f449897df249686c034466a1da031e215;hb=344963815c5b29449042487d942fc12f43144295;hp=c0e8438b97dd3f9761fb6da3aac5ff8a1b4c94a3;hpb=6709ce5303ca41a0dd7046d092b6638b9e3dd491;p=privoxy.git
diff --git a/GNUmakefile.in b/GNUmakefile.in
index c0e8438b..fcd44c4f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
# Note: GNUmakefile is built automatically from GNUmakefile.in
#
-# Written by and Copyright (C) 2001-2018 members of the
+# Written by and Copyright (C) 2001-2021 members of the
# Privoxy team. https://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
@@ -32,7 +32,7 @@
@SET_MAKE@
#############################################################################
-# Version number (for RPM)
+# Version number
#############################################################################
VERSION_MAJOR = @VERSION_MAJOR@
@@ -42,7 +42,7 @@ CODE_STATUS = @CODE_STATUS@
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
SNAPVERSION = $(VERSION)-$(shell date "+%Y%m%d")
-SOURCE_DATE_EPOCH = @SOURCE_DATE_EPOCH@
+SOURCE_DATE_EPOCH ?= @SOURCE_DATE_EPOCH@
MTREE_SPEC_FILE = privoxy-$(VERSION)-$(CODE_STATUS).spec
#############################################################################
@@ -59,8 +59,8 @@ exec_prefix = @exec_prefix@
CONF_BASE = @sysconfdir@
SBIN_DEST = @sbindir@
MAN_DIR = @mandir@
-MAN_DEST = $(MAN_DIR)/man1
-MAN_PAGE = privoxy.1
+MAN_DEST = $(MAN_DIR)/man8
+MAN_PAGE = privoxy.8
SHARE_DEST = @datadir@
DOC_DEST = $(SHARE_DEST)/doc/privoxy
VAR_DEST = @localstatedir@
@@ -445,7 +445,8 @@ tarball-dist: dist-check clean clobber
for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
-o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \
- -name "PACKAGERS" -o -path "*.git/*" \) | sort`; do \
+ -name "PACKAGERS" -o -path "*.git/*" \
+ -o -path "*/doc/webserver/feeds*" \) | sort`; do \
files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
done && \
cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
@@ -461,7 +462,8 @@ mtree-spec:
$(ECHO) "#mtree 2.0" > $(MTREE_SPEC_FILE)
for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
-o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \
- -name "PACKAGERS" -o -path "*.git/*" -o -name "*.spec" \) | env -i sort`; do \
+ -name "PACKAGERS" -o -path "*.git/*" -o -name "*.spec" \
+ -o -path "*/doc/webserver/feeds*" \) | env -i sort`; do \
$(ECHO) "privoxy-$(VERSION)-$(CODE_STATUS)/$$i time=$(SOURCE_DATE_EPOCH) type=file uname=privoxy gname=privoxy mode=0555"; \
done >> $(MTREE_SPEC_FILE)
$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
@@ -572,6 +574,7 @@ groff2html:
dok-readme: dok-release
cd doc/source && $(DB_TXT)-notoc -V nochunks readme.sgml > tmp.html &&\
$(W3M_DUMP) tmp.html > ../../README ;\
+ $(PERL) -pi'' -e 's@doc/source/readme\.sgml@README@' ../../README; \
$(DB_TXT)-notoc -V nochunks install.sgml > tmp.html &&\
$(W3M_DUMP) tmp.html > ../../INSTALL ;\
$(RM) tmp.*
@@ -586,7 +589,9 @@ dok-webserver:
s/<\/HEAD/\n<\/HEAD/;\
s/\.\d\. //;\
s/__copy/©/;\
- s@(\1@; s@(
\1@; s@(\n\1@; \
+ s@www.lalal.ai@
\n@;' \
doc/webserver/index.html && $(RM) doc/webserver/*.bak
# privoxy-index.html for local documentation:
@@ -744,9 +749,8 @@ urlmatch.@OBJEXT@: urlmatch.c urlmatch.h config.h $(PROJECT_H_DEPS) errlog.h
client-tags.@OBJEXT@: client-tags.c client-tags.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h
fuzz.@OBJEXT@: fuzz.c config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h
ssl.@OBJEXT@: ssl.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) encode.h errlog.h jcc.h miscutil.h
-
-# GNU regex
-gnu_regex.@OBJEXT@: gnu_regex.c gnu_regex.h config.h
+openssl.@OBJEXT@: openssl.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) encode.h errlog.h jcc.h miscutil.h
+ssl_common.@OBJEXT@: ssl_common.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h
# PCRS
pcrs.@OBJEXT@: pcrs.c pcrs.h config.h @STATIC_PCRE_ONLY@pcre/pcre.h
@@ -781,7 +785,7 @@ clean:
$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
config.base config.tmp \
`find . \( -name TAGS -o -name tags \) -a -not -path "./.git/*"` \
- `find . -name "*.orig" -a -not -name rc.privoxy.orig -a -not -path "./.git/*"`
+ `find . -name "*.orig" -a -not -path "./.git/*"`
clean-editor-files:
$(RM) `find . -name "*~"`
@@ -790,7 +794,7 @@ clean-editor-files:
clobber: clean-editor-files
$(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \
- privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl config.new
+ privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl
$(RM) -r autom4te.cache
#
@@ -874,7 +878,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
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) ;\
+ $(DESTDIR)$$DOC/man-page $(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 \
@@ -964,7 +968,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
$(ECHO) Installing fresh $$i;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
- elif [ -s "$(CONF_DEST)/$$i" ]; then \
+ elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
$(ECHO) Installing $$i as $$i.new ;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
NEW=1;\
@@ -990,7 +994,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
$(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+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.in | \
$(SED) 's+%SBIN_DEST%+$(SBIN_DEST)+' | \
$(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \
$(SED) 's+%USER%+$(USER)+' | \
@@ -1016,7 +1020,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
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) &&\
@@ -1036,8 +1039,8 @@ uninstall: CONF_DEST LOG_DEST PID_DEST check_doc
done ;\
fi
@$(ECHO) Removing $(PROGRAM) config files
- -@for i in $(DESTDIR)$(CONFIGS); do \
- test -f $(CONF_DEST)/$$i && $(ECHO) Removing $$i ;\
+ -@for i in $(CONFIGS); do \
+ test -f $(DESTDIR)$(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 &&\