X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=8b2fe42187f92b05acb53b8733eeddbb04933b9a;hp=e7fca442fc7c6f8e444b81f854d662733720e24f;hb=32ba28b1225c54c850c48814b018e7afcffbd0a5;hpb=12163de071e3b7c737af3b7f3d60734b1dec2429 diff --git a/GNUmakefile.in b/GNUmakefile.in index e7fca442..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 @@ -590,7 +590,8 @@ dok-webserver: s/\.\d\. //;\ s/__copy/©/;\ s@(\1@; s@(\n\1@;' \ + s@(Privoxy is a non-caching)@Privoxy logo\n\1@; \ + s@www.lalal.ai@Vocal Remover by Lalal.ai\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)+' | \ @@ -1019,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) &&\