Reorder gateway_host in struct forward_spec to save memory

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 873d46b..8b2fe42 100644 (file)
--- 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
@@ -590,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:
@@ -784,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 "*~"`
@@ -993,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)+' | \