Allow access to Privoxy's CGI pages, don't call trusted

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2d62fd4..5de6ab5 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.147 2006/09/13 01:25:16 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.153 2007/01/07 07:36:36 joergs Exp $
 #
 # Written by and Copyright (C) 2001 - 2004 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -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)
 
 
 #############################################################################
@@ -482,7 +482,7 @@ suse-dist: rpm-stuff
 #      fi
 
        $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
-       $(RPM) --clean -ta  $(TAR_ARCH)
+       $(RPMBUILD) --clean -ta  $(TAR_ARCH)
        if [ -f $(TAR_ARCH) ]; then  $(RM) $(TAR_ARCH); fi
 
 # anonymously ncftps the rpms to sourceforge
@@ -1000,9 +1000,13 @@ w32.res: w32.rc w32res.h icons/ico00001.ico icons/ico00002.ico icons/ico00003.ic
 
 # AmigaOS
 @AMIGAOS_ONLY@OBJS += amiga.o
+@AMIGAOS_ONLY@ifeq ($(shell $(CC) -dumpmachine), m68k-amigaos)
 @AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -m68020 -noixemul -fbaserel -msmall-code
 @AMIGAOS_ONLY@LDFLAGS += -m68020 -noixemul -fbaserel
 @AMIGAOS_ONLY@LIBS = -lm /gg/lib/libb/libm020/libnix/swapstack.o
+@AMIGAOS_ONLY@else
+@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -Wextra -D__USE_INLINE__ -D__NO_INTUITION_RJ_MACROS
+@AMIGAOS_ONLY@endif
 @AMIGAOS_ONLY@amiga.o: amiga.c amiga.h config.h
 
 
@@ -1132,8 +1136,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
                $(CAT) config >config~ ;\
                $(MV) config.base config ;\
        fi
-       $(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \
-       $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.tmp
+       $(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 \
@@ -1187,7 +1191,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
        fi ;\
        $(ECHO) Installing configuration files to $(CONF_DEST);\
        for i in $(CONFIGS); do \
-               if [ "$$i" == "default.action" ] || [ "$$i" == "default.filter" ] || [ "$$i" == "standard.action" ]; then \
+               if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
                        $(RM) $(CONF_DEST)/$$i ;\
                        $(ECHO) Installing fresh $$i;\
                        $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
@@ -1220,7 +1224,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
                $(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+%USER%+$(USER)+' | \
                $(SED) 's+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\
                        $(INSTALL) $(INSTALL_P) slackware/rc.privoxy /etc/rc.d/ ;\
                $(ECHO) "Installing for Slackware." ;\
@@ -1355,6 +1359,25 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.153  2007/01/07 07:36:36  joergs
+# Added AmigaOS4 support.
+#
+# Revision 1.152  2006/12/13 14:53:51  etresoft
+# Include any existing LDFLAGS environment when linking so that a MacOS X Universal Binary can be created.
+#
+# Revision 1.151  2006/11/30 01:08:55  hal9
+# Fix problem with variable declarations in the Slackware section. Thanks to higuita.
+#
+# Revision 1.150  2006/10/25 11:55:45  fabiankeil
+# Fix sed regexes for rewriting "confdir ." and "logdir .".
+# Thanks to Darel Henman for reporting this.
+#
+# Revision 1.149  2006/10/11 01:40:28  hal9
+# Apply patch from  Neil McCalden to fix syntax issue.
+#
+# Revision 1.148  2006/09/26 10:57:58  hal9
+# Including Karsten's patch to fix make create-snapshot.
+#
 # Revision 1.147  2006/09/13 01:25:16  hal9
 # Make sure install forces in new default.action, default.filter, and
 # standard.filter. These are privoxy files, not user files.