Wrap $(CC) with quotes. Merged from -devel.

diff --git a/servers/slapd/back-passwd/Make-template b/servers/slapd/back-passwd/Make-template
index 39ea8c292effb4f9b7f7251ab2bb7a96a423168a..a809038cb17b7dbc1fe3061f3b3c4dd7deb17169 100644 (file)
--- a/servers/slapd/back-passwd/Make-template
+++ b/servers/slapd/back-passwd/Make-template
@@ -27,7 +27,7 @@ CFLAGS        = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS)
 all:   FORCE
        -@echo "$(SLAPD_BACKENDS)" | grep LDAP_PASSWD 2>&1 > /dev/null; \
        if [ $$? = 0 ]; then \
-            $(MAKE) $(MFLAGS) CC=$(CC) libback-passwd.a; \
+            $(MAKE) $(MFLAGS) CC="$(CC)" libback-passwd.a; \
        else \
            echo "Include -DLDAP_PASSWD in SLAPD_BACKENDS in the"; \
            echo "Make-common file to build the passwd backend"; \
@@ -65,14 +65,4 @@ depend:      FORCE
 
 links:
        @$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-search.o: search.c ../../../include/portable.h ../slap.h ../../../include/avl.h
-search.o: ../../../include/lber.h ../../../include/ldap.h
-search.o: ../../../include/lthread.h ../../../include/ldif.h
-config.o: config.c ../../../include/portable.h ../slap.h ../../../include/avl.h
-config.o: ../../../include/lber.h ../../../include/ldap.h
-config.o: ../../../include/lthread.h ../../../include/ldif.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/slapd/back-shell/Make-template b/servers/slapd/back-shell/Make-template
index 1eb631b57eb294d547675e2fd4e855b29755a27b..e0d533652c8bf3b75acabc3b82753b9553bd4451 100644 (file)
--- a/servers/slapd/back-shell/Make-template
+++ b/servers/slapd/back-shell/Make-template
@@ -29,7 +29,7 @@ CFLAGS        = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS)
 all:   FORCE
        -@echo "$(SLAPD_BACKENDS)" | grep LDAP_SHELL 2>&1 > /dev/null; \
        if [ $$? = 0 ]; then \
-            $(MAKE) $(MFLAGS) CC=$(CC) libback-shell.a; \
+            $(MAKE) $(MFLAGS) CC="$(CC)" libback-shell.a; \
        else \
            echo "Include -DLDAP_SHELL in SLAPD_BACKENDS in the"; \
            echo "Make-common file to build the shell backend"; \
@@ -67,47 +67,4 @@ depend:      FORCE
 
 links:
        @$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-init.o: init.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-init.o: ../../../include/ldap.h ../../../include/lthread.h
-init.o: ../../../include/ldif.h shell.h
-config.o: config.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-config.o: ../../../include/ldap.h ../../../include/lthread.h
-config.o: ../../../include/ldif.h shell.h
-fork.o: fork.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-fork.o: ../../../include/ldap.h ../../../include/lthread.h
-fork.o: ../../../include/ldif.h
-search.o: search.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-search.o: ../../../include/ldap.h ../../../include/lthread.h
-search.o: ../../../include/ldif.h shell.h
-bind.o: bind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-bind.o: ../../../include/ldap.h ../../../include/lthread.h
-bind.o: ../../../include/ldif.h shell.h
-unbind.o: unbind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-unbind.o: ../../../include/ldap.h ../../../include/lthread.h
-unbind.o: ../../../include/ldif.h shell.h
-add.o: add.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-add.o: ../../../include/ldap.h ../../../include/lthread.h
-add.o: ../../../include/ldif.h shell.h
-delete.o: delete.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-delete.o: ../../../include/ldap.h ../../../include/lthread.h
-delete.o: ../../../include/ldif.h shell.h
-modify.o: modify.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modify.o: ../../../include/ldap.h ../../../include/lthread.h
-modify.o: ../../../include/ldif.h shell.h
-modrdn.o: modrdn.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modrdn.o: ../../../include/ldap.h ../../../include/lthread.h
-modrdn.o: ../../../include/ldif.h shell.h
-compare.o: compare.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-compare.o: ../../../include/ldap.h ../../../include/lthread.h
-compare.o: ../../../include/ldif.h shell.h
-abandon.o: abandon.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-abandon.o: ../../../include/ldap.h ../../../include/lthread.h
-abandon.o: ../../../include/ldif.h shell.h
-result.o: result.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-result.o: ../../../include/ldap.h ../../../include/lthread.h
-result.o: ../../../include/ldif.h shell.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY