From: hno <>
Date: Mon, 1 Jul 2002 21:51:32 +0000 (+0000)
Subject: cachemgr should be installed as cachemgr.cgi where possible
X-Git-Tag: SQUID_3_0_PRE1~931
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aeb80018ef25bf0c6f62a3c4482580da5296a45;p=thirdparty%2Fsquid.git

cachemgr should be installed as cachemgr.cgi where possible
---

diff --git a/configure.in b/configure.in
index 248a7c3ba3..ee82c404be 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.274 2002/06/26 10:37:30 hno Exp $
+dnl  $Id: configure.in,v 1.275 2002/07/01 15:51:32 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.6-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.274 $)dnl
+AC_REVISION($Revision: 1.275 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -39,8 +39,10 @@ AC_OBJEXT
 if test -z "$EXEEXT"; then
 	CGIEXT=".cgi"
 else
-	CGIEXT="$EXEEXT"
+	# automake automatically adds .exe when installing binaries
+	CGIEXT=""
 fi
+AC_SUBST(CGIEXT)
 
 dnl this should be expanded to a list of platform sensible support requirements.
 dnl (adding an option like --enable-cygwin-support doesn't make sense :]) - R Collins 2001
diff --git a/src/Makefile.am b/src/Makefile.am
index 75e4b14053..8fdcb2dd74 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.24 2002/06/23 13:32:23 hno Exp $
+#  $Id: Makefile.am,v 1.25 2002/07/01 15:51:32 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -59,6 +59,7 @@ WIN32SOURCE =
 endif
 
 SUBDIRS		= fs repl auth
+CGIEXT = @CGIEXT@
 
 INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
 
@@ -78,12 +79,13 @@ libexec_PROGRAMS = \
 	@OPT_PINGER@ \
 	$(DNSSERVER) \
 	$(UNLINKD) \
-	cachemgr
+	cachemgr$(CGIEXT)
 
 cf_gen_SOURCES = cf_gen.c defines.h
 nodist_cf_gen_HEADER = cf_gen_defines.h
 cf_gen.$(OBJEXT): cf_gen_defines.h
 squidclient_SOURCES = client.c
+cachemgr__CGIEXT__SOURCES = cachemgr.c
 
 EXTRA_squid_SOURCES = \
 	delay_pools.c \