X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=fcc5cf6cec369121dde7f35e1a249329767fd87b;hb=9fcc968b9e2f18cec174d416acef2e1cba068d14;hp=2d62fd4277e77e7e66bcf70786ee893c3283659a;hpb=00e45dfbb1f93939a9c8691d3fe53d9a8f3a7bf0;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2d62fd42..fcc5cf6c 100644
--- 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.149 2006/10/11 01:40:28 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 - 2004 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -1132,8 +1132,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 +1187,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;\
@@ -1355,6 +1355,12 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# 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.