X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=GNUmakefile.in;h=e5fdc6425303f9b704263e3c04f3f2a0a609e2a4;hb=f5c1a886b7ae20da7eafb77926252eb521260728;hp=f0b75ba035ef692438a6aed7a6d47863c7535562;hpb=d718332b42f884d9c3c2fd0cfa9b83f4973c6971;p=privoxy.git
diff --git a/GNUmakefile.in b/GNUmakefile.in
index f0b75ba0..e5fdc642 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-2020 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@
@@ -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@
@@ -574,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.*
@@ -589,7 +590,8 @@ dok-webserver:
s/\.\d\. //;\
s/__copy/©/;\
s@(\1@; s@(
\n\1@;' \
+ s@(Privoxy is a non-caching)@
\n\1@; \
+ s@www.lalal.ai@
\n@;' \
doc/webserver/index.html && $(RM) doc/webserver/*.bak
# privoxy-index.html for local documentation:
@@ -783,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 "*~"`
@@ -992,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)+' | \
@@ -1018,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) &&\
@@ -1038,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 &&\