Rebuild documentation with updated changelog

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8b2fe42..fcd44c4 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -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@
@@ -968,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;\
@@ -1039,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 &&\