Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/squid/squid/src/Makefile.am,v
retrieving revision 1.66.2.2
diff -u -p -r1.66.2.2 Makefile.am
--- src/Makefile.am	14 Mar 2010 20:25:55 -0000	1.66.2.2
+++ src/Makefile.am	3 Apr 2010 20:34:03 -0000
@@ -390,7 +390,7 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defin
 ## FIXME: generate a sed command file from configure. Then this doesn't
 ## depend on the Makefile. 
 cf.data: cf.data.pre Makefile
-	sed "\
+	cat $(srcdir)/cf.data.pre | sed "\
 	s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
 	s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
 	s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
@@ -402,6 +402,7 @@ cf.data: cf.data.pre Makefile
 	s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\
 	s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\
 	s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\
+	" | sed "\
 	s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g;\
 	s%@DEFAULT_NETDB_FILE@%$(DEFAULT_NETDB_FILE)%g;\
 	s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\
@@ -411,7 +412,7 @@ cf.data: cf.data.pre Makefile
 	s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\
 	s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;\
 	s%@[V]ERSION@%$(VERSION)%g;"\
-	< $(srcdir)/cf.data.pre >$@
+	>$@
 
 store_modules.c: store_modules.sh Makefile
 	$(SHELL) $(srcdir)/store_modules.sh $(STORE_MODULES) >store_modules.c
Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/squid/squid/src/Makefile.in,v
retrieving revision 1.295.2.4
diff -u -p -r1.295.2.4 Makefile.in
--- src/Makefile.in	14 Mar 2010 20:27:27 -0000	1.295.2.4
+++ src/Makefile.in	3 Apr 2010 20:34:03 -0000
@@ -1240,7 +1240,7 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defin
 	awk -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >cf_gen_defines.h
 
 cf.data: cf.data.pre Makefile
-	sed "\
+	cat $(srcdir)/cf.data.pre | sed "\
 	s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
 	s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
 	s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
@@ -1252,6 +1252,7 @@ cf.data: cf.data.pre Makefile
 	s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\
 	s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\
 	s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\
+	" | sed "\
 	s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g;\
 	s%@DEFAULT_NETDB_FILE@%$(DEFAULT_NETDB_FILE)%g;\
 	s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\
@@ -1261,7 +1262,7 @@ cf.data: cf.data.pre Makefile
 	s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\
 	s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;\
 	s%@[V]ERSION@%$(VERSION)%g;"\
-	< $(srcdir)/cf.data.pre >$@
+	>$@
 
 store_modules.c: store_modules.sh Makefile
 	$(SHELL) $(srcdir)/store_modules.sh $(STORE_MODULES) >store_modules.c