Wrap $CC with quotes.

Patch provided by Hallvard B Furuseth <h.b.furuseth@usit.uio.no>.

diff --git a/Makefile b/Makefile
index 59df0cdc46a66516591799689b8b0734dc40e088..d910580217aa1ec345fb1709e92c8456eddf40ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -321,7 +321,7 @@ makeconfig: .makefiles buildtools
                ;; \
            esac; \
        fi; \
-       CC=$(CC); \
+       CC="$(CC)"; \
        OLDIFS="$$IFS"; \
        IFS=":"; \
        for dir in $$PATH; do \

diff --git a/build/Make-template b/build/Make-template
index 28055d9f1f4c23ebb4494f6c9b92faa3a85bd372..159070c2e77c9257adbeeacb1f0181d54cacab21 100644 (file)
--- a/build/Make-template
+++ b/build/Make-template
@@ -15,7 +15,7 @@
 
 all:   FORCE
        @if [ ! -z "$(NEEDUNPROTO)" ]; then \
-           cd unproto; $(MAKE) $(MFLAGS) CC=$(CC); \
+           cd unproto; $(MAKE) $(MFLAGS) CC="$(CC)"; \
        else \
            exit 0; \
        fi

diff --git a/servers/ldapd/Make-template b/servers/ldapd/Make-template
index e7d5388c4faa8641266227f96b2b5b985d45b603..fec808e48ff5abf353041ec06162974f71dadf52 100644 (file)
--- 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,7 +66,7 @@ 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

diff --git a/servers/slapd/back-passwd/Make-template b/servers/slapd/back-passwd/Make-template
index 0de089de553a2829e9e6db886aac63cd9fb0718b..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"; \

diff --git a/servers/slapd/back-shell/Make-template b/servers/slapd/back-shell/Make-template
index 8179e1da5d50aff638a5f3f349dccf24be65121d..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"; \

diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template
index 7464e9aa21e2ffb4942188049853be0bb9166f88..57cc719419970341523d90b9b4ef28e1d500169a 100644 (file)
--- 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"; \