Patch by Radoslaw Zielinski with minor modifications.
# Note: Makefile is built automatically from Makefile.in
#
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.159 2008/03/21 11:13:53 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.160 2008/03/27 18:27:19 fabiankeil Exp $
#
# Written by and Copyright (C) 2001 - 2007 the SourceForge
# Privoxy team. http://www.privoxy.org/
#
# Written by and Copyright (C) 2001 - 2007 the SourceForge
# Privoxy team. http://www.privoxy.org/
@$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
$(CHMOD) $(DIR_MODE) $(MKDIR)
@$(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)
+ @$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) \
+ $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
+ $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
@# Install the executable binary, strip if invoked as install-strip
@test -n "$(STRIP)" &&\
$(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
@# 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)
+ $(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST)
+ $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
@# Install the DOCS and man page. install-sh only does one file at a time.
@# FIXME: only handles jpegs.
@# Install the DOCS and man page. install-sh only does one file at a time.
@# FIXME: only handles jpegs.
else \
DOC=$(prefix)/doc/privoxy ;\
fi;\
else \
DOC=$(prefix)/doc/privoxy ;\
fi;\
- $(MKDIR) $$DOC $$DOC/user-manual $$DOC/faq $$DOC/developer-manual \
- $$DOC/man-page $$DOC/images $(MAN_DEST) ;\
+ $(MKDIR) $(DESTDIR)$$DOC $(DESTDIR)$$DOC/user-manual $(DESTDIR)$$DOC/faq $(DESTDIR)$$DOC/developer-manual \
+ $(DESTDIR)$$DOC/man-page $(DESTDIR)$$DOC/images $(DESTDIR)$(MAN_DEST) ;\
if [ -d "$(DOK_WEB)" ]; then \
if [ -d "$(DOK_WEB)" ]; then \
- $(ECHO) Installing FAQ, Manual, and other docs to $$DOC;\
+ $(ECHO) Installing FAQ, Manual, and other docs to $(DESTDIR)$$DOC;\
for i in user-manual developer-manual faq; do \
for ii in $(DOK_WEB)/$$i/*html; do \
for i in user-manual developer-manual faq; do \
for ii in $(DOK_WEB)/$$i/*html; do \
- $(INSTALL) $(INSTALL_T) $$ii $$DOC/$$i;\
+ $(INSTALL) $(INSTALL_T) $$ii $(DESTDIR)$$DOC/$$i;\
done ;\
done ;\
for i in $(DOK_WEB)/user-manual/*jpg; do \
done ;\
done ;\
for i in $(DOK_WEB)/user-manual/*jpg; do \
- $(INSTALL) $(INSTALL_T) $$i $$DOC/user-manual;\
+ $(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$$DOC/user-manual;\
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $$DOC/man-page;\
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $$DOC/index.html;\
- $(INSTALL) $(INSTALL_T) AUTHORS $$DOC;\
- $(INSTALL) $(INSTALL_T) LICENSE $$DOC;\
- $(INSTALL) $(INSTALL_T) README $$DOC;\
- $(INSTALL) $(INSTALL_T) ChangeLog $$DOC;\
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC;\
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $(DESTDIR)$$DOC/man-page;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\
+ $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC/user-manual;\
fi
@# Not all platforms support gzipped man pages.
fi
@# 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
+ @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/privoxy.1
+ -$(INSTALL) $(INSTALL_T) privoxy.1 $(DESTDIR)$(MAN_DEST)/privoxy.1
@# Change the config file default directories according to the configured ones
@$(ECHO) Rewriting config for this installation
@# Change the config file default directories according to the configured ones
@$(ECHO) Rewriting config for this installation
@# 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.
@# 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
+ @$(ECHO) Installing templates to $(DESTDIR)$(CONF_DEST)/templates
@for i in `find templates -type f`; do \
@for i in `find templates -type f`; do \
- $(INSTALL) $(INSTALL_T) $$i $(CONF_DEST)/templates ;\
+ $(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
done
@# FIXME: group/user validation is overly convoluted.
done
@# FIXME: group/user validation is overly convoluted.
fi ;\
INSTALL_CONF="$(INSTALL_R)" ;\
fi ;\
fi ;\
INSTALL_CONF="$(INSTALL_R)" ;\
fi ;\
- $(ECHO) Installing configuration files to $(CONF_DEST);\
+ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
for i in $(CONFIGS); do \
if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
for i in $(CONFIGS); do \
if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
- $(RM) $(CONF_DEST)/$$i ;\
+ $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
$(ECHO) Installing fresh $$i;\
$(ECHO) Installing fresh $$i;\
- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
elif [ -s "$(CONF_DEST)/$$i" ]; then \
$(ECHO) Installing $$i as $$i.new ;\
elif [ -s "$(CONF_DEST)/$$i" ]; then \
$(ECHO) Installing $$i as $$i.new ;\
- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\
+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
fi ;\
done ;\
if [ -n "$$NEW" ]; then \
fi ;\
done ;\
if [ -n "$$NEW" ]; then \
- $(CHMOD) $(RWD_MODE) $(CONF_DEST)/*.new || exit 1 ;\
+ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
fi ;\
$(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 ;\
+ [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
+ $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
+ $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || exit 1 ;\
if [ x$$USER != x ]; then \
if [ x$$USER != x ]; then \
- $(CHOWN) $$USER $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
+ $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || \
$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
fi ;\
if [ x$$GROUP_T != x ]; then \
$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
fi ;\
if [ x$$GROUP_T != x ]; then \
- $(CHGRP) $$GROUP_T $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
+ $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || \
$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
fi ;\
$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
fi ;\
- $(CHMOD) $(RWD_MODE) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
+ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(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 | \
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+%CONF_DEST%+$(CONF_DEST)+' | \
$(SED) 's+%USER%+$(USER)+' | \
$(SED) 's+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\
$(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \
$(SED) 's+%USER%+$(USER)+' | \
$(SED) 's+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\
- $(INSTALL) $(INSTALL_P) slackware/rc.privoxy /etc/rc.d/ ;\
+ $(INSTALL) $(INSTALL_P) slackware/rc.privoxy $(DESTDIR)/etc/rc.d/ ;\
$(ECHO) "Installing for Slackware." ;\
$(ECHO) "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 \
$(ECHO) "Installing for Slackware." ;\
$(ECHO) "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 \
$(SED) 's,^PRIVOXY_BIN=.*,PRIVOXY_BIN="/usr/local/sbin/$(PROGRAM)",' privoxy.init |\
$(SED) 's,^PRIVOXY_CONF=.*,PRIVOXY_CONF="$(CONF_DEST)/config",' |\
$(SED) "s,^PRIVOXY_USER=.*,PRIVOXY_USER=$$USER," > init.tmp ;\
$(SED) 's,^PRIVOXY_BIN=.*,PRIVOXY_BIN="/usr/local/sbin/$(PROGRAM)",' privoxy.init |\
$(SED) 's,^PRIVOXY_CONF=.*,PRIVOXY_CONF="$(CONF_DEST)/config",' |\
$(SED) "s,^PRIVOXY_USER=.*,PRIVOXY_USER=$$USER," > init.tmp ;\
- $(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) -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" ;\
+ $(INSTALL) $(INSTALL_P) init.tmp $(DESTDIR)/etc/rc.d/init.d/privoxy && $(RM) init.tmp;\
+ $(MKDIR) $(DESTDIR)/etc/logrotate.d/ ;\
+ $(ECHO) "Installing logrotate script to $(DESTDIR)/etc/logrotate.d/" ;\
+ $(INSTALL) -m 0644 privoxy.logrotate $(DESTDIR)/etc/logrotate.d/privoxy ;\
+ elif [ -d $(DESTDIR)/etc/init.d ] && [ -w $(DESTDIR)/etc/init.d ] ; then \
+ $(ECHO) "Installing generic init script to $(DESTDIR)/etc/init.d/privoxy" ;\
$(ECHO) "Please check that the PATHs are correct, and edit if needed." ;\
$(ECHO) "Please check that the PATHs are correct, and edit if needed." ;\
- $(INSTALL) $(INSTALL_P) privoxy-generic.init /etc/init.d/privoxy ;\
+ $(INSTALL) $(INSTALL_P) privoxy-generic.init $(DESTDIR)/etc/init.d/privoxy ;\
fi ;\
else \
$(ECHO) "No init script installed, install it manually if needed" ;\
fi ;\
else \
$(ECHO) "No init script installed, install it manually if needed" ;\
$(RM) config.base config.tmp
@# mmmmm, good.
@$(ECHO) "$(PROGRAM_V) installation succeeded!"
$(RM) config.base config.tmp
@# mmmmm, good.
@$(ECHO) "$(PROGRAM_V) installation succeeded!"
- @$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)"
+ @$(ECHO) "The Privoxy configuration files have been installed in $(DESTDIR)$(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.
# rmdir is used as a precaution since it will not remove non-empty
# directories. RH init script creates lock file and pid file.
## end:
# $Log: GNUmakefile.in,v $
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.160 2008/03/27 18:27:19 fabiankeil
+# Remove kill-popups action.
+#
# Revision 1.159 2008/03/21 11:13:53 fabiankeil
# Only gather host information if it's actually needed.
# Also move the code out of accept_connection() so it's less likely
# Revision 1.159 2008/03/21 11:13:53 fabiankeil
# Only gather host information if it's actually needed.
# Also move the code out of accept_connection() so it's less likely
projects / privoxy.git / commitdiff