X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=78b44aa8e7127fe7a6e662bf6704c61c10cc887e;hp=ebea7c1bb6226d773834eb43b98197f8db0c2e00;hb=7080a82ad34bd1f81efb7219df775ccb18468303;hpb=7c157a5666614ab4662eab35e073eae4061c0e69

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ebea7c1b..78b44aa8 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.129 2002/10/20 07:15:12 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.136 2002/12/28 04:10:21 david__schmidt Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -53,12 +53,18 @@ SNAPVERSION   = $(RPM_VERSION)-$(shell date "+%Y%m%d")
 DIR_PRIVOXY_ROOT     := .
 DIR_PRIVOXY_SRC      := $(DIR_PRIVOXY_ROOT)/src
 DIR_PRIVOXY_SRC_PCRE := $(DIR_PRIVOXY_ROOT)/pcre
+DIR_PRIVOXY_SRC_JAVA := $(DIR_PRIVOXY_ROOT)/src/java
 DIR_PRIVOXY_OBJ      := $(DIR_PRIVOXY_ROOT)/obj
 
 #############################################################################
-# Directories for "make install"
+# "make install" settings
 #############################################################################
 
+# User and Group settings
+USER   = @USER@
+GROUP  = @GROUP@
+
+# PATHS set from configure
 prefix       = @prefix@
 exec_prefix  = @exec_prefix@
 CONF_BASE    = @sysconfdir@
@@ -82,33 +88,47 @@ PIDS_DEST    = $(VAR_DEST)/run
 # finally if $prefix=/usr/local and VAR_DEST=$prefix/var it 
 # changes this to /var for storing the logs and pidfile
 
-# used in source dir only, the install goes to $share_dest/doc/privoxy
-DOK_WEB = doc/webserver/
+# Where to find docs. The install goes to $share_dest/doc/privoxy.
+DOK_WEB    = doc/webserver/
+
+# Install usage should be compatible with install-sh.
+INSTALL    = @INSTALL@
+
+# Permissions used during installation.
+# Binaries (daemon, init scripts)
+BIN_MODE	 = 0755
+# Files daemon writes to: *action, trust and logs.
+RWD_MODE   = 0660
+# Misc files, docs, etc.
+RA_MODE    = 0664
+# Directory
+DIR_MODE   = 0755
+
+INSTALL_P  = -m $(BIN_MODE)  
+INSTALL_T  = -m $(RA_MODE)
+INSTALL_D  = -m $(DIR_MODE) -d
+INSTALL_R  = -m $(RWD_MODE)
+# install options for superuser install
+#INSTALL_S  = -g  -o  
 
 #############################################################################
-# Build tools
+# Build and Install tools
 #############################################################################
 
 PROGRAM    = privoxy@EXEEXT@
 CC         = @CC@
 ECHO       = echo
 GZIP_PROG  = gzip
-# Install usage should be compatible with install-sh.
-INSTALL    = @INSTALL@
-INSTALL_P  = -m 0755  
-INSTALL_T  = -m 0664 
-INSTALL_D  = -m 0755 -d
-INSTALL_R  = 0660
-# install options for superuser install
-#INSTALL_S  = -g @GROUP@ -o @USER@ 
 # id -u is not universal. FIXME: need to set from configure. Breaks on
 # Solaris.
 #ID         = id -u
+ID         = id
 LD         = @CC@
 RM         = rm -f
 RMDIR      = rmdir
 MKDIR      = ./mkinstalldirs
 STRIP_PROG = strip
+CP         = cp -f
 SED	      = sed
 GREP       = grep
 CAT        = cat
@@ -120,6 +140,8 @@ TOUCH      = touch
 KILL       = kill
 CHMOD      = chmod
 CHOWN      = chown
+CHGRP      = chgrp
+GROUPS     = groups
 DOC_STATUS = @DOC_STATUS@
 # Note: Please make sure that -d ldp.dsl\#html stays the last option to
 #       $(JADEBIN), because for some targets "-notoc" will be appended
@@ -128,10 +150,6 @@ TARGET_OS  = @host@
 PERL       = perl
 DOC_DIR    = doc/source
 
-#User Group paras
-USER       = @USER@
-GROUP	 = @GROUP@
-
 # Program to do LF->CRLF
 #
 # The sed version should be the most portable, but it doesn't work for me,
@@ -140,6 +158,8 @@ GROUP	 = @GROUP@
 #DOSFILTER  = $(SED) -e $$'s,$$,\r,'
 #DOSFILTER  = gawk -v ORS='\r\n' '{print $0;}'
 DOSFILTER  = $(PERL) -p -e 's/\n/\r\n/'
+CVSROOT    = :pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa
+TMPDIR     := $(shell mktemp -d /tmp/$(PROGRAM).XXXXXX)
 
 #############################################################################
 # Setup for make distribution rh and suse for now 
@@ -207,6 +227,10 @@ PCRE_SRC     = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/get.c $(DIR_PRIVOXY_SRC
 PCRE_OBJS    = @STATIC_PCRE_ONLY@$(PCRE_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@)
 PCRE_HDRS    = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/chartables.c $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h
 
+ACTIVITY_SRC  = @ACTIVITY_ONLY@$(DIR_PRIVOXY_SRC)/stats.c
+ACTIVITY_OBJS = @ACTIVITY_ONLY@$(ACTIVITY_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@)
+ACTIVITY_HDRS = @ACTIVITY_ONLY@$(ACTIVITY_SRC:.c=.h) $(DIR_PRIVOXY_SRC)/ipc.h
+
 # No REGEX (maybe because dynamically linked pcreposix):
 REGEX_SRC    =
 @STATIC_PCRE_ONLY@REGEX_SRC = $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.c
@@ -223,9 +247,9 @@ SOCKET_LIB   = @SOCKET_LIB@
 # PThreads library, if needed.
 PTHREAD_LIB  = @PTHREAD_ONLY@@PTHREAD_LIB@
 
-SRCS         = $(C_SRC)  $(W32_SRC)  $(PCRS_SRC)  $(PCRE_SRC)  $(REGEX_SRC)
-OBJS         = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS)
-HDRS         = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS)
+SRCS         = $(C_SRC)  $(W32_SRC)  $(PCRS_SRC)  $(PCRE_SRC)  $(REGEX_SRC)  $(ACTIVITY_SRC)
+OBJS         = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(ACTIVITY_OBJS)
+HDRS         = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(ACTIVITY_HDRS)
 LIBS         = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB)
 
 
@@ -264,7 +288,7 @@ all: $(PROGRAM) default.action
 suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \
 install conectiva-spec conectiva-dist conectiva-upload debian-dist \
 debian-upload ensure-wdump ensure-jadebin ensure-dkprefix CONF_DEST LOG_DEST \
-PID_DEST check_doc install-strip uninstall GROUP_T
+PID_DEST check_doc install-strip uninstall GROUP_T java-activity-console
 
 
 #############################################################################
@@ -277,6 +301,7 @@ $(DIR_PRIVOXY_OBJ)/%.o: $(DIR_PRIVOXY_SRC_PCRE)/%.c $(DIR_PRIVOXY_OBJ)
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 $(DIR_PRIVOXY_OBJ):
+	$(CHMOD) $(DIR_MODE) $(MKDIR)
 	$(MKDIR) obj
 
 #############################################################################
@@ -661,6 +686,13 @@ tarball-upload:
 tarball-clean:
 	$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
 
+#############################################################################
+# java Activity Console 
+#############################################################################
+java-activity-console:
+	javac -classpath $(DIR_PRIVOXY_SRC_JAVA):$(CLASSPATH) $(DIR_PRIVOXY_SRC)/java/org/privoxy/activityconsole/*.java
+	jar -cvfm ActivityConsole.jar $(DIR_PRIVOXY_SRC_JAVA)/org/privoxy/activityconsole/acon.manifest -C $(DIR_PRIVOXY_SRC_JAVA) org/privoxy/activityconsole
+
 #############################################################################
 #
 # Documentation
@@ -849,29 +881,31 @@ install-strip:
 #
 # FIXME: id handling needs help, probably via configure, since 'id -u' is not 
 # universally reliable (eg Solaris). Group handling could be better. 
-# Perhaps the whole user/group validation should be done here.
+# Perhaps the whole user/group validation should be done here, and simplified.
+PROGRAM_V = Privoxy $(VERSION)
 install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
-	# Quick test for valid USER.
-	if [ -n "$(USER)" ]; then \
-		id $(USER) >/dev/null || exit 1;\
-	fi
-	# Test for valid group.
-	if [ -n "$(GROUP_T)" ] && [ -n "$(USER)" ] && ! groups $(USER) | $(GREP) "\<$(GROUP_T)\>" >/dev/null; then \
-		$(ECHO) Group $(GROUP_T) for User $(USER) is invalid && exit 1 ;\
+	@# Quick test for valid USER.
+	@if [ -n "$(USER)" ]; then \
+		$(ID) $(USER) >/dev/null || exit 1;\
 	fi
+	@# Test for valid group. FIXME. USER does not have to belong to GROUP 
+	@# for file ownership purposes.
+# 	if [ -n "$(GROUP_T)" ] && [ -n "$(USER)" ] && ! $(GROUPS) $(USER) | $(GREP) "\<$(GROUP_T)\>" >/dev/null; then \
+# 		$(ECHO) Group $(GROUP_T) for User $(USER) is invalid && exit 1 ;\
+# 	fi
 	
-	$(ECHO) "Creating directories, and preparing Privoxy installation"
-	$(CHMOD) 0755 $(MKDIR)
-	$(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \
+	@$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
+	$(CHMOD) $(DIR_MODE) $(MKDIR)
+	@$(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \
 		$(LOG_DEST) $(PID_DEST)
-	# Install the executable binary, strip if invoked as install-strip
-	test -n "$(STRIP)" &&\
+	@# Install the executable binary, strip if invoked as install-strip
+	@test -n "$(STRIP)" &&\
 	$(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
 	$(ECHO) Installing $(PROGRAM) executable to $(SBIN_DEST)
 	$(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST)
      
-	# Install the DOCS and man page 
-	-if [ $(check_doc) = 0 ]; then \
+	@# Install the DOCS and man page. install-sh only does one file at a time.
+	-@if [ $(check_doc) = 0 ]; then \
 		DOC=$(DOC_DEST) ;\
 	else \
 		DOC=$(prefix)/doc/privoxy ;\
@@ -896,13 +930,13 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 		$(INSTALL) $(INSTALL_T) ChangeLog $$DOC;\
 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC;\
 	fi
-	# Not all platforms support gzipped man pages.
-	$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
+	@# Not all platforms support gzipped man pages.
+	@$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
 	-$(INSTALL) $(INSTALL_T) privoxy.1  $(MAN_DEST)/privoxy.1
 
-	# Change the config file default directories according to the configured ones
-	$(ECHO) Rewriting config for this installation
-	if [ -f config.base ] ; then \
+	@# Change the config file default directories according to the configured ones
+	@$(ECHO) Rewriting config for this installation
+	@if [ -f config.base ] ; then \
 		$(CAT) config >config~ ;\
 		$(MV) config.base config ;\
 	fi
@@ -911,67 +945,75 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 	$(MV) config config.base
 	$(MV) config.updated config 
 
-	# Install the config support files. Test for root install, and abort 
-	# if there is no privoxy user, and no other user was enabled during 
-	# configure. Later, install init script if appropriate.
-	$(ECHO) Installing templates to $(CONF_DEST)/templates
-	for i in `find templates -type f`; do \
+	@# Install the config support files. Test for root install, and abort 
+	@# if there is no privoxy user, and no other user or group was enabled
+	@# during configure.
+	@$(ECHO) Installing templates to $(CONF_DEST)/templates
+	@for i in `find templates -type f`; do \
 		$(INSTALL) $(INSTALL_T) $$i $(CONF_DEST)/templates ;\
 	done
 
-	if [ "`id |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\
+	@# FIXME: group/user validation is overly convoluted.
+	@# If superuser install ... we require a minimum of group ownership
+	@# of those files the daemon writes to, to be non-root owned.
+	@if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\
 		if [ x$(USER) = x ] || [ $(USER) = root ]; then \
-			if [ "`id privoxy`" ]; then \
-				$(ECHO) "Warning: Setting user and group to privoxy";\
-				INSTALL_CONF="$(INSTALL_T) -g privoxy -o privoxy" ;\
-				USER=privoxy ;\
-				GROUP_T=privoxy ;\
+			if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \
+				if [ "`$(ID) privoxy`" ] && \
+					$(GROUPS) privoxy | $(SED) 's/^.*://' |$(GREP) "\<privoxy\>" >/dev/null; then \
+					$(ECHO) "Warning: Setting group owner to privoxy";\
+					GROUP_T=privoxy ;\
+				else \
+					$(ECHO)  "******************************************************************" ;\
+					$(ECHO)  " WARNING! WARNING! installing config files as root!" ;\
+					$(ECHO)  " It is strongly recommended to run $(PROGRAM) as a non-root user," ;\
+					$(ECHO)  " and to install the config files as that user and/or group!" ;\
+					$(ECHO)  " Please read INSTALL, and create a privoxy user and group!" ;\
+					$(ECHO)  "*******************************************************************" ;\
+					exit 1 ;\
+				fi ;\
 			else \
-				$(ECHO)  "******************************************************************" ;\
-				$(ECHO)  " WARNING! WARNING! installing config files as root!" ;\
-				$(ECHO)  " It is strongly recommended to run $(PROGRAM) as non-root user," ;\
-				$(ECHO)  " and to install the config files as that user!" ;\
-				$(ECHO)  " Please read INSTALL, and create a privoxy user!" ;\
-				$(ECHO)  "*******************************************************************" ;\
-				exit 1 ;\
+				GROUP_T=$(GROUP) ;\
 			fi ;\
+			INSTALL_CONF="$(INSTALL_R) -g $$GROUP_T " ;\
 		else \
 			$(ECHO) "Superuser install, installing config files as $(USER):$(GROUP_T)" ;\
-			INSTALL_CONF="$(INSTALL_T) -o $(USER) -g $(GROUP_T)" ;\
+			INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
+			GROUP_T=$(GROUP_T) ;\
 		fi ;\
 	else \
 		if [ ! "`id $(USER)`" = "`id`" ] ;then \
 			$(ECHO) "** WARNING ** current install user different from configured user!!" ;\
 			$(ECHO) "Edit may fail." ;\
 		fi ;\
-		INSTALL_CONF="$(INSTALL_T)" ;\
+		INSTALL_CONF="$(INSTALL_R)" ;\
 	fi ;\
 	$(ECHO) Installing configuration files to $(CONF_DEST);\
 	for i in $(CONFIGS); do \
 		if [ -s "$(CONF_DEST)/$$i" ] ; then \
 			$(ECHO) Installing $$i as $$i.new ;\
-			$(INSTALL) -m $(INSTALL_R) $$i $(CONF_DEST)/$$i.new || exit 1;\
+			$(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\
 			NEW=1;\
 		else \
-			if test "$$i" = "config" || test "$$i" = "default.filter"; then \
-				$(INSTALL) -m $(INSTALL_R) $$i $(CONF_DEST) || exit 1;\
-			else \
-				$(INSTALL) -m $(INSTALL_R) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
-			fi;\
+			$(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
 		fi ;\
 	done ;\
 	if [ -n "$$NEW" ]; then \
-		$(CHMOD) $(INSTALL_R) $(CONF_DEST)/*.new || exit 1 ;\
+		$(CHMOD) $(RWD_MODE) $(CONF_DEST)/*.new || exit 1 ;\
 		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
 	fi ;\
 	[ ! -f $(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(LOG_DEST) || \
 		$(ECHO) Checking logfiles in $(LOG_DEST) ;\
-	$(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
+		$(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
 	if [ x$$USER != x ]; then \
-		$(CHOWN) $$USER:$$GROUP_T $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
+		$(CHOWN) $$USER $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
 		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
 	fi ;\
-	$(CHMOD) $(INSTALL_R) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
+	if [ x$$GROUP_T != x ]; then \
+		$(CHGRP) $$GROUP_T $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
+		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
+	fi ;\
+	$(CHMOD) $(RWD_MODE) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || 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 | \
@@ -990,7 +1032,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 			$(INSTALL) $(INSTALL_P) init.tmp /etc/rc.d/init.d/privoxy && $(RM) init.tmp;\
 			$(MKDIR) /etc/logrotate.d/ ;\
 			$(ECHO) "Installing logrotate script to /etc/logrotate.d/" ;\
-			$(INSTALL) $(INSTALL_P) privoxy.logrotate /etc/logrotate.d/privoxy ;\
+			$(INSTALL) -m 0644 privoxy.logrotate /etc/logrotate.d/privoxy ;\
 		elif [ -d /etc/init.d ] && [ -w /etc/init.d ] ; then \
 			$(ECHO) "Installing generic init script to /etc/init.d/privoxy" ;\
 			$(ECHO) "Please check that the PATHs are correct, and edit if needed." ;\
@@ -999,75 +1041,91 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
 	else \
 		$(ECHO) "No init script installed, install it manually if needed" ;\
 	fi
-	# mmmmm, good.
-	@$(ECHO) "Privoxy installation succeeded!"
+	@# mmmmm, good.
+	@$(ECHO) "$(PROGRAM_V) installation succeeded!"
 	@$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)"
 
 # rmdir is used as a precaution since it will not remove non-empty
 # directories. RH init script creates lock file and pid file.
 uninstall: CONF_DEST LOG_DEST PID_DEST check_doc
-	$(ECHO) Starting Privoxy uninstallation
-	# KILL privoxy if running
-	-if [ -f /etc/redhat-release ] && [ -d /etc/rc.d/init.d/ ] && [ -w /etc/rc.d/init.d/ ] ; then \
+	@$(ECHO) Starting Privoxy uninstallation
+	@# KILL privoxy if running
+	-@if [ -f /etc/redhat-release ] && [ -x /etc/rc.d/init.d/privoxy ]; then \
 		/etc/rc.d/init.d/privoxy stop >/dev/null 2>/dev/null ;\
 		chkconfig --del $(PROGRAM) 2>/dev/null;\
 	fi
-	-@ test -f $(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\
-          $(KILL) `$(CAT) $(PID_DEST)/privoxy.pid` 
-	-@ test -f /var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\
-          $(KILL) `$(CAT) /var/run/privoxy.pid `
+	-@test -f $(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\
+         $(KILL) `$(CAT) $(PID_DEST)/privoxy.pid` || :
+	-@test -f /var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\
+          $(KILL) `$(CAT) /var/run/privoxy.pid ` || :
 
-	# Program binary
-	$(ECHO) Removing $(PROGRAM) binary
+	@# Program binary
+	@$(ECHO) Removing $(PROGRAM) binary
 	$(RM) $(SBIN_DEST)/$(PROGRAM) $(SBIN_DEST)/$(PROGRAM)~
 
-	# config files and dir, and maybe old install backups
-	$(ECHO) Removing $(PROGRAM) config files
-	for i in $(CONFIGS); do \
+	@# config files and dir, and maybe old install backups
+	-@if [ -d $(CONF_DEST) ]; then \
+		$(ECHO) Saving $(PROGRAM) config files to /tmp/$(PROGRAM)-save ;\
+		$(MKDIR) /tmp/$(PROGRAM)-save ;\
+		cd $(CONF_DEST) ;\
+		for i in $(CONFIGS); do \
+			[ -f $$i ] && $(CP) $$i /tmp/$(PROGRAM)-save ;\
+		done ;\
+	fi
+	@$(ECHO) Removing $(PROGRAM) config files
+	-@for i in $(CONFIGS); do \
+		test -f $(CONF_DEST)/$$i && $(ECHO) Removing $$i ;\
 		$(RM) $(CONF_DEST)/$$i $(CONF_DEST)/$$i~ $(CONF_DEST)/$$i.new ;\
 	done
-	$(RM) -r $(CONF_DEST)/templates
+	-@test -d $(CONF_DEST)/templates && $(RM) -r $(CONF_DEST)/templates &&\
+	$(ECHO) "Removing $(CONF_DEST)/templates/*"
 	
-	# man page and docs
-	$(ECHO) Removing $(PROGRAM) docs
+	@# man page and docs
+	@$(ECHO) Removing $(PROGRAM) docs
 	-$(RM) $(MAN_DEST)/privoxy.1*
 	-$(RM) -r $(DOC_DEST) || $(RM) -r $(prefix)/doc/privoxy
 
-	# Log and jarfile and pidfile
-	$(ECHO) Removing $(PROGRAM) logs
+	@# Log and jarfile and pidfile
+	@$(ECHO) Removing $(PROGRAM) logs
 	-$(RM) $(LOG_DEST)/logfile $(PID_DEST)/privoxy.pid $(LOG_DEST)/jarfile
 
-	# Final clean up of unused directories. Special handling of CONF and LOG
+	@# Final clean up of unused directories. Special handling of CONF and LOG
      # destinations.
-	$(ECHO) Removing $(PROGRAM) directories
-	for i in $(LOG_DEST) $(CONF_DEST); do \
+	@$(ECHO) Removing $(PROGRAM) directories
+	@for i in $(LOG_DEST) $(CONF_DEST); do \
 		if test -d $$i; then \
+			$(ECHO) Removing $$i ;\
 			$(RMDIR) $$i || $(ECHO) "$$i is not empty, not removed" ;\
 		fi;\
 	done
-	if [  ! "$(prefix)" = "/usr/local" ] ;then \
+	@if [  ! "$(prefix)" = "/usr/local" ] ;then \
 		for i in $(MAN_DEST) $(MAN_DIR) $(SHARE_DEST)/doc $(SHARE_DEST) $(SBIN_DEST); do \
 			if test -d $$i; then \
+				$(ECHO) Removing $$i ;\
 				$(RMDIR) $$i || $(ECHO) "$$i is not empty, not removed" ;\
 			fi;\
 		done;\
 		if test $(LOG_DEST) != /var/log/privoxy && test -d $(prefix)/var/log; then \
+			$(ECHO) Removing $(prefix)/var/log ;\
 			$(RMDIR) $(prefix)/var/log || $(ECHO) "$(prefix)/var/log is not empty, not removed";\
 		fi ;\
 		if test $(PID_DEST) != /var/run && test -d $(prefix)/var/run; then \
+			$(ECHO) Removing $(prefix)/var/run ;\
 			$(RMDIR) $(prefix)/var/run || $(ECHO) "$(prefix)/var/run is not empty, not removed";\
 		fi ;\
 		if test $(prefix)/var != /var && test -d $(prefix)/var; then \
+			$(ECHO) Removing $(prefix)/var ;\
 			$(RMDIR) $(prefix)/var || $(ECHO) "$(prefix)/var is not empty, not removed" ;\
 		fi ;\
 		if test $(prefix) != / && test $(prefix) != /usr && test -d $(prefix); then \
+			$(ECHO) Removing $(prefix) ;\
 			$(ECHO) Removing installation directory $(prefix) ;\
 			$(RMDIR) $(prefix) || $(ECHO) "$(prefix) is not empty, not removed" ;\
 		fi;\
 	fi
 
-	# init scripts and logrotate
-	if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
+	@# init scripts and logrotate
+	@if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
 		$(ECHO) Removing $(PROGRAM) init script ;\
 		if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ]  && [ -w /etc/rc.d/ ] ; then \
 			$(RM) /etc/rc.d/rc.privoxy ;\
@@ -1079,7 +1137,7 @@ uninstall: CONF_DEST LOG_DEST PID_DEST check_doc
 			$(ECHO) "Unable to remove privoxy init script, not installed or permission denied" ;\
 		fi ;\
 	fi
-	$(ECHO) Privoxy uninstalled, bye
+	@$(ECHO) Privoxy uninstalled, bye
 
 coffee:
 	 @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,101,0,109,143,205,13,192,32,8,133,\
@@ -1095,6 +1153,38 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.136  2002/12/28 04:10:21  david__schmidt
+# Initial drop of dashboard instrumentation - enabled with
+# --enable-activity-console
+#
+# Revision 1.135  2002/11/04 05:11:05  hal9
+# Just a clean up of overly verbose output from install/uninstall.
+#
+# Revision 1.134  2002/10/28 06:01:39  hal9
+# Make uninstall: cp -v problems on SF Solaris.
+#
+# Revision 1.133  2002/10/28 02:12:22  hal9
+# Make install/uninstall:
+# - More cleanup of variables
+# - Make the minimum requirement for root install, an available non-root GROUP.
+#   If a privoxy user exists (and no other USER is specified), then the files
+#   that require write access are installed as group owned by privoxy. FIXME:
+#   There has to be a cleaner way to do this.
+# - Uninstall now saves configuration files to /tmp.
+#
+# Revision 1.132  2002/10/24 22:24:58  hal9
+# Make install: Minor clean up for variable handling.
+#
+# Revision 1.131  2002/10/23 07:00:21  agotneja
+# added a chmod on mkinstalldirs just before using it, otherwise it
+# will fail when running make for the first time.
+#
+# Revision 1.130  2002/10/22 05:49:14  hal9
+# Make install:
+# - /bin/sh on Solaris does not handle: ! test.
+# - Remove some unused doc variables.
+# - Make configs group writable.
+#
 # Revision 1.129  2002/10/20 07:15:12  hal9
 # Getting near the end (I hope) of install target updates:
 # - Rewrite RH init script to reflect configured values.