From 129f98f3da724c1841aa19f83234fe58d0478cb6 Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Sat, 21 Nov 2009 23:20:01 +0100 Subject: [PATCH] FreeBSD for some reason some times do not like our big cf.data script Split in multiple expressions specified by -e arguments. Seems to work better. The large blob had a bit of extra space characters in it from the line folding which seems to be related to the failure. (each command began with a space) --- src/Makefile.am | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 186e8bea4e..a190d8a11e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -761,27 +761,27 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre ## FIXME: generate a sed command file from configure. Then this doesn't ## 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;"\ + sed \ + -e "s%[@]DEFAULT_HTTP_PORT[@]%$(DEFAULT_HTTP_PORT)%g" \ + -e "s%[@]DEFAULT_ICP_PORT[@]%$(DEFAULT_ICP_PORT)%g" \ + -e "s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%${CACHE_EFFECTIVE_USER}%g" \ + -e "s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g" \ + -e "s%[@]DEFAULT_DNSSERVER[@]%$(DEFAULT_DNSSERVER)%g" \ + -e "s%[@]DEFAULT_UNLINKD[@]%$(DEFAULT_UNLINKD)%g" \ + -e "s%[@]DEFAULT_PINGER[@]%$(DEFAULT_PINGER)%g" \ + -e "s%[@]DEFAULT_DISKD[@]%$(DEFAULT_DISKD)%g" \ + -e "s%[@]DEFAULT_CACHE_LOG[@]%$(DEFAULT_CACHE_LOG)%g" \ + -e "s%[@]DEFAULT_ACCESS_LOG[@]%$(DEFAULT_ACCESS_LOG)%g" \ + -e "s%[@]DEFAULT_STORE_LOG[@]%$(DEFAULT_STORE_LOG)%g" \ + -e "s%[@]DEFAULT_PID_FILE[@]%$(DEFAULT_PID_FILE)%g" \ + -e "s%[@]DEFAULT_NETDB_FILE[@]%$(DEFAULT_NETDB_FILE)%g" \ + -e "s%[@]DEFAULT_SWAP_DIR[@]%$(DEFAULT_SWAP_DIR)%g" \ + -e "s%[@]DEFAULT_ICON_DIR[@]%$(DEFAULT_ICON_DIR)%g" \ + -e "s%[@]DEFAULT_CONFIG_DIR[@]%$(DEFAULT_CONFIG_DIR)%g" \ + -e "s%[@]DEFAULT_PREFIX[@]%$(DEFAULT_PREFIX)%g" \ + -e "s%[@]DEFAULT_HOSTS[@]%$(DEFAULT_HOSTS)%g" \ + -e "s%[@]IPV6_ONLY_SETTING[@]%$(SET_IPV6_SETTINGS)%g" \ + -e "s%[@]SQUID[@]%SQUID\ $(VERSION)%g" \ < $(srcdir)/cf.data.pre >$@ repl_modules.cc: repl_modules.sh Makefile -- 2.47.3