]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
wrap $(CC) with quotes, merged from -devel.
authorKurt Zeilenga <kurt@openldap.org>
Wed, 16 Sep 1998 05:28:26 +0000 (05:28 +0000)
committerKurt Zeilenga <kurt@openldap.org>
Wed, 16 Sep 1998 05:28:26 +0000 (05:28 +0000)
servers/ldapd/Make-template
servers/slapd/tools/Make-template
servers/slurpd/Make-template

index f8781c5323b6bc4c327f83d65b2b1230583b2110..fec808e48ff5abf353041ec06162974f71dadf52 100644 (file)
@@ -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
+
index b5c3c17d3ebb46cda5a59a1694c97b111c158716..c8a9bb30474ba3ae21c1caade5f71a7cf9e15063 100644 (file)
@@ -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"; \
index e46998241bfb6826ce3064cf2a3413996d454927..91734c51bbf25b51a9621c42d9bcce3956745ccd 100644 (file)
@@ -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