From: hno <>
Date: Tue, 16 Oct 2001 20:25:57 +0000 (+0000)
Subject: Don't mess with libexecdir in the makefiles. This is the job of configure
X-Git-Tag: SQUID_3_0_PRE1~1362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d55cb98e4a8313e5d6e1d2d1b68ae7d342c05e5;p=thirdparty%2Fsquid.git

Don't mess with libexecdir in the makefiles. This is the job of configure
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 608a51f44f..5b8d4a694d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.8 2001/09/25 23:56:22 robertc Exp $
+#  $Id: Makefile.am,v 1.9 2001/10/16 14:25:57 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -59,8 +59,6 @@ WIN32SOURCE =
 endif
 
 SUBDIRS		= fs repl auth
-#look into pkgsbin..
-libexecdir      = ${prefix}/libexec/squid
 
 INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
 
diff --git a/src/Makefile.in b/src/Makefile.in
index e6c71add74..ee6a2845da 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.216 2001/10/03 14:56:55 hno Exp $
+#  $Id: Makefile.in,v 1.217 2001/10/16 14:25:57 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -31,6 +31,7 @@ exec_prefix = @exec_prefix@
 
 bindir = @bindir@
 sbindir = @sbindir@
+libexecdir = @libexecdir@
 datadir = @datadir@
 sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@
@@ -124,8 +125,6 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 makesnmplib = @makesnmplib@
-#look into pkgsbin..
-libexecdir = ${prefix}/libexec/squid
 
 @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
 @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
@@ -437,17 +436,17 @@ pinger_DEPENDENCIES = ../lib/libmiscutil.a
 pinger_LDFLAGS =
 @USE_DELAY_POOLS_FALSE@am__objects_1 =
 @USE_DELAY_POOLS_TRUE@am__objects_1 = delay_pools.$(OBJEXT)
-@USE_DNSSERVER_FALSE@am__objects_2 = dns_internal.$(OBJEXT)
 @USE_DNSSERVER_TRUE@am__objects_2 = dns.$(OBJEXT)
+@USE_DNSSERVER_FALSE@am__objects_2 = dns_internal.$(OBJEXT)
 @ENABLE_HTCP_TRUE@am__objects_3 = htcp.$(OBJEXT)
-@MAKE_LEAKFINDER_TRUE@am__objects_4 = leakfinder.$(OBJEXT)
 @MAKE_LEAKFINDER_FALSE@am__objects_4 =
+@MAKE_LEAKFINDER_TRUE@am__objects_4 = leakfinder.$(OBJEXT)
 @USE_SNMP_TRUE@am__objects_5 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT)
 @USE_SNMP_FALSE@am__objects_5 =
-@ENABLE_SSL_FALSE@am__objects_6 =
 @ENABLE_SSL_TRUE@am__objects_6 = ssl_support.$(OBJEXT)
-@ENABLE_UNLINKD_TRUE@am__objects_7 = unlinkd.$(OBJEXT)
+@ENABLE_SSL_FALSE@am__objects_6 =
 @ENABLE_UNLINKD_FALSE@am__objects_7 =
+@ENABLE_UNLINKD_TRUE@am__objects_7 = unlinkd.$(OBJEXT)
 @ENABLE_WIN32SPECIFIC_FALSE@am__objects_8 =
 @ENABLE_WIN32SPECIFIC_TRUE@am__objects_8 = win32.$(OBJEXT)
 am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \