X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=fe5d15f6180ae0f9cf17ef64033fd956bd953d04;hp=7b36259fe4833df5992758cf5032064efee59d24;hb=4880f78d657e6f68dfbde5ffafd026049cb3c216;hpb=c1e32dfc7f83c5f8c8c3526691ae05609ea137c4;ds=sidebyside diff --git a/GNUmakefile.in b/GNUmakefile.in index 7b36259f..fe5d15f6 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.113 2002/07/30 21:50:25 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.120 2002/10/10 20:39:27 dessent Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -59,10 +59,30 @@ DIR_PRIVOXY_OBJ := $(DIR_PRIVOXY_ROOT)/obj # Directories for "make install" ############################################################################# -DEST = @prefix@ -CONFDEST = @prefix@@sysconfdir@ -SBIN_DEST = @prefix@@sbindir@ -MAN_DEST = @prefix@@mandir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +CONF_BASE = @sysconfdir@ +SBIN_DEST = @sbindir@ +MAN_DIR = @mandir@ +MAN_DEST = $(MAN_DIR)/man1 +SHARE_DEST = @datadir@ +DOC_DEST = $(SHARE_DEST)/doc/privoxy +VAR_DEST = @localstatedir@ +LOGS_DEST = $(VAR_DEST)/log/privoxy +PIDS_DEST = $(VAR_DEST)/run + +# if $prefix = /usr/local then the default CONFDEST change from +# CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy +# by the target rule CONF_DEST +# +# also if the $prefix is /usr/local and there is no +# $(SHARE_DEST)/doc, it checks for $prefix/doc and installs there +# instead in this situation +# +# 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_USEM = doc/webserver/user-manual ############################################################################# @@ -74,11 +94,16 @@ CC = @CC@ ECHO = echo GZIP_PROG = gzip INSTALL = @INSTALL@ -INSTALL_P = -m 0750 -g @GROUP@ -o @USER@ -b -INSTALL_T = -m 0640 -g @GROUP@ -o @USER@ -b -INSTALL_D = -m 0750 -g @GROUP@ -o @USER@ -d +INSTALL_P = -m 0755 +INSTALL_T = -m 0644 +INSTALL_D = -m 0755 -d +# install options for superuser install +#INSTALL_S = -g @GROUP@ -o @USER@ +ID = id -u LD = @CC@ RM = rm -f +RMDIR = rmdir +MKDIR = ./mkinstalldirs STRIP_PROG = strip SED = sed GREP = grep @@ -87,6 +112,10 @@ RPM = rpm MV = mv TAR = tar LN = ln +TOUCH = touch +KILL = kill +CHMOD = chmod +CHOWN = chown WDUMP = @WDUMP@ -dump JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ @@ -167,7 +196,7 @@ C_SRC = \ $(DIR_PRIVOXY_SRC)/urlmatch.c C_OBJS = $(C_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) -C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h +C_HDRS = $(C_SRC:.c=.h) $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/actionlist.h W32_SRC = @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.c $(DIR_PRIVOXY_SRC)/w32taskbar.c $(DIR_PRIVOXY_SRC)/win32.c W32_FILES = @WIN_ONLY@$(DIR_PRIVOXY_OBJ)/w32res.res @@ -240,7 +269,8 @@ all: $(PROGRAM) default.action .PHONY: all inifiles redhat-dist redhat-upload redhat-test solaris-dist suse-dist \ 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 +debian-upload ensure-wdump ensure-jadebin ensure-dkprefix CONF_DEST LOG_DEST \ +PID_DEST check_doc install-strip ############################################################################# @@ -253,7 +283,7 @@ $(DIR_PRIVOXY_OBJ)/%.o: $(DIR_PRIVOXY_SRC_PCRE)/%.c $(DIR_PRIVOXY_OBJ) $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(DIR_PRIVOXY_OBJ): - mkdir obj + $(MKDIR) obj ############################################################################# # Strip master copy comments from default.action: @@ -305,9 +335,63 @@ dist-check: if [ "$$answer" != "yes i am sure" ]; then exit 1; fi \ fi; - ############################################################################# -# RPM specifice stuff (SuSE or Redhat, ..) +# create tar.gz from CVS: +# This make-target is usually called through 'create-archive'. If you +# run 'make create-snapshot' without setting SNAPVERSION, you'll get a +# tar.gz with the current date in the name and as a releasenumber in the +# spec-file. But the main usage is to run it as follows (Red Hat example): +# make SNAPVERSION=1.6x create-snapshot +# This creates a tar.gz and spec-file for a Red Hat 6.x version. +############################################################################# +create-snapshot: + @tag=`cvs -d $(CVSROOT) status Makefile | awk ' /Sticky Tag/ { print $$3 } '` 2> /dev/null; \ + [ x"$$tag" = x"(none)" ] && tag=HEAD; \ + echo "*** Creating package from $$tag!"; \ + cd $(TMPDIR) ; cvs -Q -d $(CVSROOT) export -r $$tag current || echo "Um... export aborted." + @cd $(TMPDIR)/current; \ + TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ + if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ + -e 's/^\(Release:\).*/\1 $(SNAPVERSION)/g' \ + privoxy-rh.spec > $$TMPFILE ; then \ + $(MV) -f $$TMPFILE privoxy-rh.spec; \ + else \ + $(ECHO) "Could not set version info in specfile."; \ + exit 1;\ + fi;\ + if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ + -e 's/^\(Release:\).*/\1 $(SNAPVERSION)/g' \ + privoxy-suse.spec > $$TMPFILE ; then \ + $(MV) -f $$TMPFILE privoxy-suse.spec; \ + else \ + $(ECHO) "Could not set version info in specfile."; \ + exit 1;\ + fi; \ + $(RM) $(TMPFILE); \ + cd $(TMPDIR)/current; \ + $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude \ + "privoxy-suse.spec" -czf $(TMPDIR)/$(PROGRAM)-rh-$(VERSION).tar.gz .; \ + $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude \ + "privoxy-rh.spec" -czf $(TMPDIR)/$(PROGRAM)-suse-$(VERSION).tar.gz . + @$(MV) -f $(TMPDIR)/$(PROGRAM)-rh-$(VERSION).tar.gz . + @$(MV) -f $(TMPDIR)/$(PROGRAM)-suse-$(VERSION).tar.gz . + @$(RM) -rf $(TMPDIR) + @echo "Resulting files are $(PROGRAM)-rh-$(VERSION).tar.gz and" + @echo " $(PROGRAM)-suse-$(VERSION).tar.gz" + + +############################################################################# +# looks at the version of Makefile and exports a corresponding source-tree +# example: if the Makefile has the sticky tag v_2_9_13, you'll get +# privoxy-*-2.4.13.tar.gz. Two different tar files will be written, one for +# Red Hat and one for SuSe (different spec-files) +############################################################################# +create-archive: + make SNAPVERSION=$(SNAPVERSION) create-snapshot + + +############################################################################# +# RPM specific stuff (SuSE or Redhat, ..) ############################################################################# rpm-stuff: dist-check clean clobber for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ @@ -609,11 +693,16 @@ webserver: tidy @$(ECHO) it will not remove obsolete documents. @$(ECHO) ------------------------------------------------------- - @$(ECHO) Uploading + @$(ECHO) Uploading html @cd doc/webserver; \ upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \ $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp' + @$(ECHO) Uploading pdf + @cd doc/pdf;\ + zip privoxy-pdf-docs *.pdf ;\ + scp -q privoxy-pdf-docs.zip ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/pdf + @$(ECHO) Fixing permissions @ssh ijbswa.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true' @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null; true' @@ -673,9 +762,9 @@ $(DIR_PRIVOXY_OBJ)/dftables@EXEEXT@: $(DIR_PRIVOXY_SRC_PCRE)/dftables.c $( $(CC) -o $(DIR_PRIVOXY_SRC_PCRE)/dftables@EXEEXT@ $(CFLAGS) $(DIR_PRIVOXY_SRC_PCRE)/dftables.c # Win32 -$(DIR_PRIVOXY_OBJ)/w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h pcrs.h project.h w32log.h w32taskbar.h win32.h -$(DIR_PRIVOXY_OBJ)/w32taskbar.@OBJEXT@: w32taskbar.c config.h w32log.h w32taskbar.h -$(DIR_PRIVOXY_OBJ)/win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h pcrs.h project.h w32log.h win32.h +$(DIR_PRIVOXY_OBJ)/w32log.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/w32log.c $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/w32taskbar.h $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h +$(DIR_PRIVOXY_OBJ)/win32.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/project.h $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/win32.c $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h +$(DIR_PRIVOXY_OBJ)/w32taskbar.@OBJEXT@: $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/w32taskbar.c $(DIR_PRIVOXY_SRC)/w32taskbar.h $(DIR_PRIVOXY_OBJ)/w32res.res: $(DIR_PRIVOXY_SRC)/w32res.rc \ $(DIR_PRIVOXY_SRC)/w32res.h \ @@ -713,7 +802,7 @@ tidy: $(RM) `find . -name ".\#*"` clobber: tidy - $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \ + $(RM) GNUmakefile configure src/config.h.in src/config.h config.cache config.status config.log logfile \ privoxy.log core *.tar.gz *.tar privoxy-cl.spec $(DOC_DIR)/ldp.dsl \ $(DOC_DIR)/GNUmakefile @@ -727,24 +816,195 @@ distclean: clobber tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) -install: all +CONF_DEST:=$(shell if [ "$(prefix)" = "/usr/local" ] && [ "$(CONF_BASE)" = "$(prefix)/etc" ];then \ + $(ECHO) "$(CONF_BASE)/privoxy";\ + else\ + $(ECHO) "$(CONF_BASE)";\ + fi) + +LOG_DEST:=$(shell if [ "$(prefix)" = "/usr/local" ] && [ "$(LOGS_DEST)" = "$(prefix)/var/log/privoxy" ];then \ + $(ECHO) "/var/log/privoxy" ;\ + else\ + $(ECHO) "$(LOGS_DEST)";\ + fi) + +PID_DEST:=$(shell if [ "$(prefix)" = "/usr/local" ] && [ "$(PIDS_DEST)" = "$(prefix)/var/run" ];then \ + $(ECHO) "/var/run" ;\ + else\ + $(ECHO) "$(PIDS_DEST)";\ + fi) + +check_doc:=$(shell if [ ! -d "$(SHARE_DEST)/doc" ] && [ "$(prefix)" = "/usr/local" ] && [ -d "$(prefix)/doc" ];then \ + $(ECHO) "1";\ + else\ + $(ECHO) "0";\ + fi) + +install-strip: + $(MAKE) INSTALL_P='$(INSTALL_P) -s' install + +install: CONF_DEST LOG_DEST PID_DEST check_doc all # - # FIXME: This is a dirty hack to have an install target - # that works at least for some setups. This needs - # to be fixed! + # FIXME: test this in all systems and with several options and report any bugs # - $(STRIP_PROG) $(PROGRAM) - $(INSTALL) $(INSTALL_D) $(SBIN_DEST) - $(INSTALL) $(INSTALL_D) $(DEST)/user-manual - $(INSTALL) $(INSTALL_D) $(CONFDEST)/templates - $(INSTALL) $(INSTALL_D) $(DEST)/$(DOK_WEB_USEM) + + $(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(SHARE_DEST) $(MAN_DEST) $(LOG_DEST) $(PID_DEST) + + # Install the executable binary $(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST) - if [ -d "$(DOK_WEB_USEM)" ]; then $(INSTALL) $(INSTALL_T) $(DOK_WEB_USEM)/[a-z]* $(DEST)/$(DOK_WEB_USEM); fi - $(INSTALL) $(INSTALL_T) templates/[a-z]* $(CONFDEST)/templates - $(INSTALL) $(INSTALL_T) config default.action default.filter trust $(CONFDEST) + + $(INSTALL) $(INSTALL_D) $(CONF_DEST) + $(INSTALL) $(INSTALL_D) $(CONF_DEST)/templates + + # Install the DOCS and man page + if [ $(check_doc) = 0 ]; then \ + DOC=$(DOC_DEST) ;\ + else \ + DOC=$(prefix)/doc/privoxy ;\ + fi;\ + $(INSTALL) $(INSTALL_D) $$DOC ;\ + $(INSTALL) $(INSTALL_D) $$DOC/user-manual ;\ + $(INSTALL) $(INSTALL_D) $$DOC/faq ;\ + if [ -d "$(DOK_WEB_USEM)" ]; then \ + $(INSTALL) $(INSTALL_T) $(DOK_WEB_USEM)/[^C]* $$DOC/user-manual;\ + $(INSTALL) $(INSTALL_T) $(DOK_WEB_USEM)/[^C]* $$DOC/faq;\ + $(INSTALL) $(INSTALL_T) $(DOK_WEB_USEM)/../p_doc.css $$DOC;\ + $(INSTALL) $(INSTALL_T) AUTHORS $$DOC;\ + $(INSTALL) $(INSTALL_T) LICENSE $$DOC;\ + $(INSTALL) $(INSTALL_T) README $$DOC;\ + $(INSTALL) $(INSTALL_T) ChangeLog $$DOC;\ + fi + -$(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz + + # Change the Config file default directories acording to the configured ones + if [ -e config.base ] ; then \ + $(CAT) config >config~ ;\ + $(MV) config.base config ;\ + fi + $(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \ + $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated + $(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. + $(INSTALL) $(INSTALL_T) templates/[^C]* $(CONF_DEST)/templates + if [ `$(ID)` = 0 ] ;then\ + if [ x$(USER) = x ]; then \ + if [ `$(ID) privoxy` ]; then \ + $(ECHO) -e "\n Setting user and group to privoxy";\ + INSTALL_CONF="$(INSTALL_T) -b -g privoxy -o privoxy" ;\ + else \ + $(ECHO) -e "******************************************************************" ;\ + $(ECHO) -e " WARNING! WARNING! installing config files as root!" ;\ + $(ECHO) -e " It is strongly recommended to run $(PROGRAM) as non-root user," ;\ + $(ECHO) -e " and to install the config files as that user!" ;\ + $(ECHO) -e " Please read INSTALL, and create a privoxy user!" ;\ + $(ECHO) -e "*******************************************************************" ;\ + exit 1 ;\ + fi ;\ + else \ + if [ x$(GROUP) = x ]; then \ + $(ECHO) -e "\n Superuser install, installing config files as $(USER),$(USER)" ;\ + INSTALL_CONF="$(INSTALL_T) -b -o $(USER) -g $(USER)" ;\ + else \ + $(ECHO) -e "\n Superuser install, installing config files as $(USER),$(GROUP)" ;\ + INSTALL_CONF="$(INSTALL_T) -b -o $(USER) -g $(GROUP)" ;\ + fi ;\ + fi ;\ + else \ + if [ ! `$(ID) $(USER)` = `$(ID)` ] ;then \ + $(ECHO) -e "\n ** WARNING ** current install user different from configured user!! edit may fail.\n" ;\ + fi ;\ + INSTALL_CONF="$(INSTALL_T) -b " ;\ + fi ;\ + $(INSTALL) $$INSTALL_CONF config default.action default.filter standard.action $(CONF_DEST) ;\ + if [ ! -s "$(CONF_DEST)/user.action" ] ; then \ + $(INSTALL) $$INSTALL_CONF user.action $(CONF_DEST) ;\ + fi ;\ + if [ ! -s "$(CONF_DEST)/trust" ] ; then \ + $(INSTALL) $$INSTALL_CONF trust $(CONF_DEST) ;\ + fi ;\ + + # setup the logfiles + # mode 0640 in the logs for privacy reasons + $(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile + -$(CHOWN) $(USER),$(GROUP) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \ + $(ECHO) -e "\n ** WARNING ** current install user different from configured user!! Loging may fail\n" + -$(CHMOD) 0640 $(LOG_DEST)/logfile $(LOG_DEST)/jarfile + + # Install the init and logrotate scripts. Test for Slackware and Red Hat only. + # Install if dest is writable. + if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ + $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ + $(SED) 's+%SBIN_DEST%+$(SBIN_DEST)+' | \ + $(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \ + $(SED) 's+%USER%+$(USER)+' | \ + $(SED) 's+%GROUP%+$(GROUP)+' >slackware/rc.privoxy ;\ + $(INSTALL) $(INSTALL_P) slackware/rc.privoxy /etc/rc.d/ ;\ + $(ECHO) -e "\n Dont forget to add the rc.privoxy to rc.local if you want it started at every boot" ;\ + elif [ -f /etc/redhat-release ] && [ -d /etc/rc.d/init.d/ ] && [ -w /etc/rc.d/init.d/ ] ; then \ + $(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy ;\ + $(MKDIR) /etc/logrotate.d/ ;\ + $(INSTALL) $(INSTALL_P) privoxy.logrotate /etc/logrotate.d/privoxy ;\ + elif [ -d /etc/init.d ] && [ -w /etc/init.d ] ; then \ + $(INSTALL) $(INSTALL_P) privoxy-generic.init /etc/init.d/privoxy ;\ + else \ + $(ECHO) -e "\n No init script installed, install it manually" ;\ + fi # FIXME $(ECHO) privoxy.logrotate privoxy.monthly privoxy.weekly - # FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz - $(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy + +uninstall: CONF_DEST LOG_DEST PID_DEST check_doc + # + # FIXME: test this in all systems and with several options and report any bugs + # + + # KILL privoxy if running + -@ $(KILL) `$(CAT) $(PID_DEST)/privoxy.pid ` >/dev/nul 2>/dev/null + -@ $(KILL) `$(CAT) /var/run/privoxy.pid ` >/dev/nul 2>/dev/null + + # Program binary + $(RM) $(SBIN_DEST)/$(PROGRAM) $(SBIN_DEST)/$(PROGRAM)~ + + # config files and dir and maybe old install backups + $(RM) $(CONF_DEST)/config $(CONF_DEST)/default.action $(CONF_DEST)/default.filter \ + $(CONF_DEST)/trust $(CONF_DEST)/standard.action $(CONF_DEST)/user.action \ + $(CONF_DEST)/config~ $(CONF_DEST)/default.action~ $(CONF_DEST)/default.filter~ \ + $(CONF_DEST)/trust~ $(CONF_DEST)/standard.action~ $(CONF_DEST)/user.action~ + $(RM) -r $(CONF_DEST)/templates + -$(RMDIR) $(CONF_DEST) || $(ECHO) -e " $(CONF_DEST) is not empty, couldnt remove it\n" ;\ + + # man page and docs + -$(RM) $(MAN_DEST)/privoxy.1.gz + -$(RM) -r $(DOC_DEST) || $(RM) -r $(prefix)/doc/privoxy + + # Log and jarfile and pidfile + -$(RM) $(LOG_DEST)/logfile || $(RM) /var/log/privoxy/logfile + -$(RM) $(LOG_DEST)/jarfile || $(RM) /var/log/privoxy/jarfile + -$(RM) $(PID_DEST)/privoxy.pid || $(RM) /var/run/privoxy.pid + + # final clean up of unused directories + if [ ! "$(prefix)" = "/usr/local" ] ;then \ + $(RMDIR) $(MAN_DEST) || $(ECHO) -e " $(MAN_DEST) is not empty, couldnt remove it\n" ;\ + $(RMDIR) $(MAN_DIR) || $(ECHO) -e " $(MAN_DIR) is not empty, couldnt remove it\n" ;\ + $(RMDIR) $(SHARE_DEST)/doc || $(ECHO) -e " $(SHARE_DEST)/doc is not empty, couldnt remove it\n" ;\ + $(RMDIR) $(SHARE_DEST) || $(ECHO) -e " $(SHARE_DEST) is not empty, couldnt remove it\n" ;\ + $(RMDIR) $(CONF_BASE) || $(ECHO) -e " $(CONF_BASE) is not empty, couldnt remove it\n" ;\ + $(RMDIR) $(SBIN_DEST) || $(ECHO) -e " $(SBIN_DEST) is not empty, couldnt remove it\n" ;\ + $(RMDIR) $(LOG_DEST) || $(ECHO) -e " $(LOG_DEST) is not empty, couldnt remove it\n" ;\ + $(RMDIR) $(prefix) || $(ECHO) -e " $(prefix) is not empty, couldnt remove it\n" ;\ + fi + # init scripts and logrotate + if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ + $(RM) /etc/rc.d/rc.privoxy ;\ + elif [ -f /etc/redhat-release ] && [ -d /etc/rc.d/init.d/ ] && [ -w /etc/rc.d/init.d/ ] ; then \ + $(RM) /etc/rc.d/init.d/privoxy /etc/logrotate.d/privoxy;\ + elif [ -d /etc/init.d ] && [ -w /etc/init.d ] ; then \ + $(RM) /etc/init.d/privoxy ;\ + else \ + $(ECHO) -e "\n Unable to remove privoxy init script... not installed or permition denied" ;\ + fi 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,\ @@ -760,6 +1020,34 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.120 2002/10/10 20:39:27 dessent +# +# +# Fixes for Win32 GUI build (added "$(DIR_PRIVOXY_SRC)/" to dependencies list) +# +# Revision 1.119 2002/09/23 03:42:41 hal9 +# This is higuita's make install/uninstall patch. Needs testing please!!! +# +# Revision 1.118 2002/09/11 08:22:37 oes +# Fixed path (C_HDRS are in src/ now) +# +# Revision 1.117 2002/09/06 23:33:35 hal9 +# Fix clobber for config.h and config.h.in are in src now. +# +# Revision 1.116 2002/09/06 05:22:57 hal9 +# Adapt make webserver target to 3.0 for pdf uploading. +# +# Revision 1.115 2002/09/05 19:13:04 hal9 +# Migrate Karstens make snapshot stuff (not tested). +# +# Revision 1.114 2002/09/05 11:58:30 oes +# Synced in some changes fromm the stable branch: +# From Revision 1.104.2.14 2002/08/10 11:19:37 oes: +# - Add dependency: pcrs.o deps on config.h +# Revision 1.104.2.9 2002/07/26 15:17:02 oes +# - Added generation of default.action from defaul.action.master +# - Deleted obsolete re_filterfile.txt generation +# # Revision 1.113 2002/07/30 21:50:25 hal9 # Add redhat-test target, and migrate the RPM_PACKAGEV stuff from 3.0 branch. #