Bug #1019: Support --program-transform and related configure options

diff --git a/Makefile.am b/Makefile.am
index ed2cf80282d0d60082cf964aab6c35a03daf9c00..fbaab50110c25289b9b9a72aa07625f0e5116634 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.21 2003/04/20 03:35:39 robertc Exp $
+# $Id: Makefile.am,v 1.22 2004/10/10 03:02:42 hno Exp $
 #
 
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5
@@ -8,7 +8,7 @@ DIST_SUBDIRS    = lib snmplib scripts src icons errors contrib doc helpers test-sui
 SUBDIRS                = lib @makesnmplib@ scripts src icons errors doc helpers test-suite
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
-DEFAULT_PINGER         = $(libexecdir)/pinger$(EXEEXT)
+DEFAULT_PINGER         = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 
 dist-hook:
        @ for subdir in include include/samba/nsswitch; do \

diff --git a/src/Makefile.am b/src/Makefile.am
index 72cfb3449531f63428701477a6e4375eac27fd1d..a3bf8a1a1f20c60742c0a3364389e5f1eeeb4736 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.93 2004/08/30 03:28:56 robertc Exp $
+#  $Id: Makefile.am,v 1.94 2004/10/10 03:02:42 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -734,16 +734,16 @@ EXTRA_DIST = \
 DEFAULT_PREFIX         = $(prefix)
 DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
 DEFAULT_MIME_TABLE     = $(sysconfdir)/mime.conf
-DEFAULT_DNSSERVER       = $(libexecdir)/dnsserver$(EXEEXT)
+DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_LOG_PREFIX     = $(localstatedir)/logs
 DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
 DEFAULT_PID_FILE        = $(DEFAULT_LOG_PREFIX)/squid.pid
 DEFAULT_SWAP_DIR        = $(localstatedir)/cache
-DEFAULT_PINGER         = $(libexecdir)/pinger$(EXEEXT)
-DEFAULT_UNLINKD                = $(libexecdir)/unlinkd$(EXEEXT)
-DEFAULT_DISKD          = $(libexecdir)/diskd$(EXEEXT)
+DEFAULT_PINGER         = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD                = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD          = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_ICON_DIR       = $(datadir)/icons
 DEFAULT_ERROR_DIR      = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
 DEFAULT_MIB_PATH       = $(datadir)/mib.txt