$NetBSD: patch-ab,v 1.3 2006/11/24 18:26:06 drochner Exp $ --- GNUmakefile.in.orig 2006-10-25 13:55:45.000000000 +0200 +++ GNUmakefile.in @@ -246,7 +246,7 @@ OTHER_CFLAGS = CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ @STATIC_PCRE_ONLY@ -Ipcre -LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) +LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) ############################################################################# @@ -1126,22 +1126,6 @@ install: CONF_DEST LOG_DEST PID_DEST che @$(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 \ - $(CAT) config >config~ ;\ - $(MV) config.base config ;\ - fi - $(SED) 's+^confdir \.+confdir $(CONF_DEST)+' config | \ - $(SED) 's+^logdir \.+logdir $(LOG_DEST)+' >config.tmp - -@if [ $(check_doc) = 0 ]; then \ - $(SED) 's+^#\?user-manual .*+user-manual $(DOC_DEST)/user-manual/+' config.tmp >config.updated ;\ - else \ - $(SED) 's+^#\?user-manual .*+user-manual $(prefix)/doc/privoxy/user-manual/+' config.tmp >config.updated ;\ - fi;\ - $(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.