X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=8b2fe42187f92b05acb53b8733eeddbb04933b9a;hp=f0b75ba035ef692438a6aed7a6d47863c7535562;hb=66b1e23830d60ea98b0ba2ac5644ef24a45f9c55;hpb=d718332b42f884d9c3c2fd0cfa9b83f4973c6971

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f0b75ba0..8b2fe421 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@
@@ -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@(<SUB)@<p style="text-align: center">\1@; s@(</SUB)@\1></p@;\
-	s@(Privoxy is a non-caching)@<img src="images/privoxy.png" align="right" alt="Privoxy logo">\n\1@;' \
+	s@(Privoxy is a non-caching)@<img src="images/privoxy.png" align="right" alt="Privoxy logo">\n\1@; \
+	s@www.lalal.ai@<a href="https://www.lalal.ai/"><img src="images/sponsors/lalal.ai_logo.png" align="middle" alt="Vocal Remover by Lalal.ai"></a>\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) &&\