Cleanup our big sed rule to avoid automake collisions

diff --git a/src/Makefile.am b/src/Makefile.am
index c19a8e483eab14e90d554b413a6044295bc066e6..415b0eb69ffc3692a7d4178c5ae1884ff351faa0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,8 +40,6 @@ if USE_ADAPTATION
 SUBDIRS += adaptation
 endif
 
-ADAPTATION_LIBS = @ADAPTATION_LIBS@
-
 if USE_ESI
 SUBDIRS += esi
 ESI_LOCAL_LIBS = \
@@ -792,26 +790,26 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
 ## depend on the Makefile.
 cf.data: cf.data.pre Makefile
        sed "\
-       s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
-       s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
-       s%@DEFAULT_CACHE_EFFECTIVE_USER@%${CACHE_EFFECTIVE_USER}%g;\
-       s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
-       s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
-       s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
-       s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\
-       s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\
-       s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\
-       s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\
-       s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\
-       s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g;\
-       s%@DEFAULT_NETDB_FILE@%$(DEFAULT_NETDB_FILE)%g;\
-       s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\
-       s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g;\
-       s%@DEFAULT_CONFIG_DIR@%$(DEFAULT_CONFIG_DIR)%g;\
-       s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\
-       s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;\
-       s%@IPV6_ONLY_SETTING@%$(SET_IPV6_SETTINGS)%g;\
-       s%@SQUID@%SQUID\ $(VERSION)%g;"\
+       s%[@]DEFAULT_HTTP_PORT[@]%$(DEFAULT_HTTP_PORT)%g;\
+       s%[@]DEFAULT_ICP_PORT[@]%$(DEFAULT_ICP_PORT)%g;\
+       s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%${CACHE_EFFECTIVE_USER}%g;\
+       s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g;\
+       s%[@]DEFAULT_DNSSERVER[@]%$(DEFAULT_DNSSERVER)%g;\
+       s%[@]DEFAULT_UNLINKD[@]%$(DEFAULT_UNLINKD)%g;\
+       s%[@]DEFAULT_PINGER[@]%$(DEFAULT_PINGER)%g;\
+       s%[@]DEFAULT_DISKD[@]%$(DEFAULT_DISKD)%g;\
+       s%[@]DEFAULT_CACHE_LOG[@]%$(DEFAULT_CACHE_LOG)%g;\
+       s%[@]DEFAULT_ACCESS_LOG[@]%$(DEFAULT_ACCESS_LOG)%g;\
+       s%[@]DEFAULT_STORE_LOG[@]%$(DEFAULT_STORE_LOG)%g;\
+       s%[@]DEFAULT_PID_FILE[@]%$(DEFAULT_PID_FILE)%g;\
+       s%[@]DEFAULT_NETDB_FILE[@]%$(DEFAULT_NETDB_FILE)%g;\
+       s%[@]DEFAULT_SWAP_DIR[@]%$(DEFAULT_SWAP_DIR)%g;\
+       s%[@]DEFAULT_ICON_DIR[@]%$(DEFAULT_ICON_DIR)%g;\
+       s%[@]DEFAULT_CONFIG_DIR[@]%$(DEFAULT_CONFIG_DIR)%g;\
+       s%[@]DEFAULT_PREFIX[@]%$(DEFAULT_PREFIX)%g;\
+       s%[@]DEFAULT_HOSTS[@]%$(DEFAULT_HOSTS)%g;\
+       s%[@]IPV6_ONLY_SETTING[@]%$(SET_IPV6_SETTINGS)%g;\
+       s%[@]SQUID[@]%SQUID\ $(VERSION)%g;"\
        < $(srcdir)/cf.data.pre >$@
 
 repl_modules.cc: repl_modules.sh Makefile