fix up NT exec_suffix uglies

diff --git a/src/Makefile.in b/src/Makefile.in
index 903bb21a27aae612e175276ae6ddc6f1bfd1b1c0..415d16fadd86c83e17936db78d9b39619ddfc710 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.143 1998/04/08 00:42:20 wessels Exp $
+#  $Id: Makefile.in,v 1.144 1998/04/08 05:54:08 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -54,6 +54,15 @@ MV           = @MV@
 RM             = @RM@
 SHELL          = /bin/sh
 
+# Gotta love the DOS legacy
+#
+SQUID_EXE      = squid$(exec_suffix)
+CLIENT_EXE     = client$(exec_suffix)
+DNSSERVER_EXE  = dnsserver$(exec_suffix)
+UNLINKD_EXE    = unlinkd$(exec_suffix)
+PINGER_EXE     = pinger$(exec_suffix)
+CACHEMGR_EXE   = cachemgr$(cgi_suffix)
+
 
 INCLUDE                = -I. -I../include -I$(top_srcdir)/include
 CFLAGS                 = $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
@@ -64,10 +73,10 @@ DNSSERVER_LIBS      = -L../lib -lmiscutil $(XTRA_LIBS)
 PINGER_LIBS    = -L../lib -lmiscutil $(XTRA_LIBS)
 STD_APP_LIBS    = -L../lib -lmiscutil $(XTRA_LIBS)
 
-PROGS           = squid$(exec_suffix) client$(exec_suffix)
-UTILS           = dnsserver$(exec_suffix) unlinkd$(exec_suffix)
-SUID_UTILS     = pinger$(exec_suffix)
-CGIPROGS       = cachemgr$(cgi_suffix)
+PROGS           = $(SQUID_EXE) $(CLIENT_EXE)
+UTILS           = $(DNSSERVER_EXE) $(UNLINKD_EXE)
+SUID_UTILS     = $(PINGER_EXE)
+CGIPROGS       = $(CACHEMGR_EXE)
 OBJS           = \
                access_log.o \
                acl.o \
@@ -174,7 +183,7 @@ $(OBJS): $(top_srcdir)/include/version.h
 
 $(SNMP_OBJS): $(top_srcdir)/snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
 
-squid$(exec_suffix):   $(OBJS)
+$(SQUID_EXE): $(OBJS)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(SQUID_LIBS)
 
 globals.o: globals.c Makefile
@@ -186,19 +195,19 @@ globals.c: globals.h mk-globals-c.pl
 string_arrays.c: enums.h mk-string-arrays.pl
        $(PERL) $(srcdir)/mk-string-arrays.pl < $(srcdir)/enums.h > $@
 
-client$(exec_suffix):  client.o
+$(CLIENT_EXE): client.o
        $(CC) -o $@ $(LDFLAGS) client.o $(CLIENT_LIBS)
 
-dnsserver$(exec_suffix): dnsserver.o
+$(DNSSERVER_EXE): dnsserver.o
        $(CC) -o $@ $(LDFLAGS) dnsserver.o $(DNSSERVER_LIBS)
 
-cachemgr$(cgi_suffix): cachemgr.o
+$(CACHEMGR_EXE): cachemgr.o
        $(CC) -o $@ $(LDFLAGS) cachemgr.o $(CLIENT_LIBS)
 
-pinger$(exec_suffix): pinger.o
+$(PINGER_EXE): pinger.o
        $(CC) -o $@ $(LDFLAGS) pinger.o debug.o globals.o $(PINGER_LIBS)
 
-unlinkd$(exec_suffix): unlinkd-daemon.o
+$(PINGER_EXE): unlinkd-daemon.o
        $(CC) $(LDFLAGS) unlinkd-daemon.o -o $@
 
 unlinkd-daemon.o: unlinkd.c