From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Fri, 20 Aug 2010 02:05:46 +0000 (+0200)
Subject: Kill recursive DEFAULT_HOSTS. Automake automatically adds expansions to Makefile... 
X-Git-Tag: take1~361
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=089267ac6ede631984cc18cd45d7fbfd7f1cb04a;p=thirdparty%2Fsquid.git

Kill recursive DEFAULT_HOSTS. Automake automatically adds expansions to Makefile.in, no need for us to wrongly try to reference them..
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 2b441b598c..e34b441d3c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -746,7 +746,6 @@ DEFAULT_LOGFILED	= $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/
 DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_ICON_DIR	= $(datadir)/icons
 DEFAULT_ERROR_DIR	= $(datadir)/errors
-DEFAULT_HOSTS		= $(DEFAULT_HOSTS)
 
 # Make location configure settings available to the code
 DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"