From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 16 Sep 1998 05:28:26 +0000 (+0000)
Subject: wrap $(CC) with quotes, merged from -devel.
X-Git-Tag: OPENLDAP_REL_ENG_1_0_2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8afa2d7384d9f451b11aff0e0fa767a084f23aea;p=thirdparty%2Fopenldap.git

wrap $(CC) with quotes, merged from -devel.
---

diff --git a/servers/ldapd/Make-template b/servers/ldapd/Make-template
index f8781c5323..fec808e48f 100644
--- a/servers/ldapd/Make-template
+++ b/servers/ldapd/Make-template
@@ -33,7 +33,7 @@ LIBS	= -llber $(ISODELIBS) $(KRBLIBS) $(ALIBS)
 
 all:	FORCE
 	@if [ "$(HAVEISODE)" = "yes" ]; then \
-            $(MAKE) $(MFLAGS) CC=$(CC) ldapd; \
+            $(MAKE) $(MFLAGS) CC="$(CC)" ldapd; \
 	else \
 	    echo "uncomment the HAVEISODE=yes line in the Make-common file to build ldapd"; \
         fi
@@ -66,15 +66,15 @@ LDAP-types.h: LDAP_tables.c
 
 install:	FORCE
 	@if [ "$(HAVEISODE)" = "yes" ]; then \
-            $(MAKE) $(MFLAGS) CC=$(CC) install-ldapd; \
+            $(MAKE) $(MFLAGS) CC="$(CC)" install-ldapd; \
 	else \
 	    echo "uncomment the HAVEISODE=yes line in the Make-common file to build and install ldapd"; \
         fi
 
-install-ldapd: $(ETCDIR) $(ETCDIR)/ldapd
+install-ldapd: $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/ldapd
 
-$(ETCDIR)/ldapd:	ldapd
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(ETCDIR)
+$(LDAP_LIBEXECDIR)/ldapd:	ldapd
+	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)
 
 lint:	FORCE
 	$(LINT) $(INCLUDES) $(DEFINES) $(SRCS)
@@ -94,29 +94,4 @@ depend:	FORCE
 
 links:
 	@$(LN) .src/*.py .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-main.o: main.c ../../include/portable.h ../../include/lber.h
-main.o: ../../include/ldap.h common.h
-detach.o: detach.c ../../include/portable.h
-setproctitle.o: setproctitle.c
-request.o: request.c ../../include/lber.h ../../include/ldap.h common.h
-bind.o: bind.c ../../include/lber.h ../../include/ldap.h common.h
-result.o: result.c ../../include/lber.h ../../include/ldap.h common.h
-error.o: error.c ../../include/lber.h ../../include/ldap.h
-search.o: search.c ../../include/lber.h ../../include/ldap.h common.h
-util.o: util.c ../../include/lber.h ../../include/ldap.h common.h
-compare.o: compare.c ../../include/lber.h ../../include/ldap.h common.h
-message.o: message.c ../../include/lber.h ../../include/ldap.h common.h
-add.o: add.c ../../include/lber.h ../../include/ldap.h common.h
-delete.o: delete.c ../../include/lber.h ../../include/ldap.h common.h
-modrdn.o: modrdn.c ../../include/lber.h ../../include/ldap.h common.h
-modify.o: modify.c ../../include/lber.h ../../include/ldap.h common.h
-abandon.o: abandon.c ../../include/lber.h ../../include/ldap.h common.h
-syntax.o: syntax.c ../../include/lber.h ../../include/ldap.h common.h
-association.o: association.c ../../include/lber.h ../../include/ldap.h common.h
-kerberos.o: kerberos.c ../../include/lber.h ../../include/ldap.h common.h
-certificate.o: certificate.c ../../include/lber.h ../../include/ldap.h common.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+
diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template
index b5c3c17d3e..c8a9bb3047 100644
--- a/servers/slapd/tools/Make-template
+++ b/servers/slapd/tools/Make-template
@@ -39,7 +39,7 @@ all:	build-edb2ldif ldif2index ldif2ldbm ldbmcat ldif2id2entry \
 
 build-edb2ldif:	FORCE
 	@if [ "$(HAVEISODE)" = "yes" ]; then \
-	    $(MAKE) $(MFLAGS) CC=$(CC) EXINCLUDES="$(ISODEINCLUDEFLAG)" \
+	    $(MAKE) $(MFLAGS) CC="$(CC)" EXINCLUDES="$(ISODEINCLUDEFLAG)" \
 		EXLDFLAGS="$(ISODELIBFLAG)" EXLIBS="$(ISODELIBS)" edb2ldif; \
         else \
             echo "uncomment the HAVEISODE=yes line in the Make-common file to build edb2ldif"; \
@@ -59,7 +59,7 @@ edb2-vers.c: $(EDB2LDIFOBJS)
 
 build-chlog2replog: FORCE
 	@if [ "$(HAVEISODE)" = "yes" ]; then \
-	    $(MAKE) $(MFLAGS) CC=$(CC) EXINCLUDES="$(ISODEINCLUDEFLAG)" \
+	    $(MAKE) $(MFLAGS) CC="$(CC)" EXINCLUDES="$(ISODEINCLUDEFLAG)" \
 		EXLDFLAGS="$(ISODELIBFLAG)" EXLIBS="$(ISODELIBS)" chlog2replog; \
         else \
             echo "uncomment the HAVEISODE=yes line in the Make-common file to build chlog2replog"; \
diff --git a/servers/slurpd/Make-template b/servers/slurpd/Make-template
index e46998241b..91734c51bb 100644
--- a/servers/slurpd/Make-template
+++ b/servers/slurpd/Make-template
@@ -39,7 +39,7 @@ all: 	FORCE
 		echo "uncomment the MAKESLAPD line in Make-common to make slurpd"; \
 		exit 0; \
 	else \
-		make slurpd; \
+		$(MAKE) slurpd; \
 	fi
 
 slurpd:	version.o