[Date Prev][Date Next]
[Chronological]
[Thread]
[Top]
Re: Makefile patch
Thanks! Applied to -devel and -stable.
- Kurt
At 03:35 AM 9/16/98 +0200, Hallvard B Furuseth wrote:
>
>Fixes to Stable. I assume Devel has the same problems; haven't checked.
>
>* Replace CC=$(CC) with CC="$(CC)" in arguments to make,
>* `make slurpd' -> $(MAKE) slurpd',
>* Add missing backslash in ./Makefile.
>
>
>--- ./build/Make-template~ Wed Sep 16 02:31:41 1998
>+++ ./build/Make-template Wed Sep 16 03:12:47 1998
>@@ -17,3 +17,3 @@
> @if [ ! -z "$(NEEDUNPROTO)" ]; then \
>- cd unproto; $(MAKE) $(MFLAGS) CC=$(CC); \
>+ cd unproto; $(MAKE) $(MFLAGS) CC="$(CC)"; \
> else \
>--- ./servers/ldapd/Make-template~ Wed Sep 16 02:32:13 1998
>+++ ./servers/ldapd/Make-template Wed Sep 16 03:14:04 1998
>@@ -35,3 +35,3 @@
> @if [ "$(HAVEISODE)" = "yes" ]; then \
>- $(MAKE) $(MFLAGS) CC=$(CC) ldapd; \
>+ $(MAKE) $(MFLAGS) CC="$(CC)" ldapd; \
> else \
>@@ -68,3 +68,3 @@
> @if [ "$(HAVEISODE)" = "yes" ]; then \
>- $(MAKE) $(MFLAGS) CC=$(CC) install-ldapd; \
>+ $(MAKE) $(MFLAGS) CC="$(CC)" install-ldapd; \
> else \
>--- ./servers/slapd/back-shell/Make-template~ Wed Sep 16 02:32:19 1998
>+++ ./servers/slapd/back-shell/Make-template Wed Sep 16 03:14:48 1998
>@@ -31,3 +31,3 @@
> if [ $$? = 0 ]; then \
>- $(MAKE) $(MFLAGS) CC=$(CC) libback-shell.a; \
>+ $(MAKE) $(MFLAGS) CC="$(CC)" libback-shell.a; \
> else \
>--- ./servers/slapd/back-passwd/Make-template~ Wed Sep 16 02:32:18 1998
>+++ ./servers/slapd/back-passwd/Make-template Wed Sep 16 03:14:28 1998
>@@ -29,3 +29,3 @@
> if [ $$? = 0 ]; then \
>- $(MAKE) $(MFLAGS) CC=$(CC) libback-passwd.a; \
>+ $(MAKE) $(MFLAGS) CC="$(CC)" libback-passwd.a; \
> else \
>--- ./servers/slapd/tools/Make-template~ Wed Sep 16 02:32:20 1998
>+++ ./servers/slapd/tools/Make-template Wed Sep 16 03:15:20 1998
>@@ -41,3 +41,3 @@
> @if [ "$(HAVEISODE)" = "yes" ]; then \
>- $(MAKE) $(MFLAGS) CC=$(CC) EXINCLUDES="$(ISODEINCLUDEFLAG)" \
>+ $(MAKE) $(MFLAGS) CC="$(CC)" EXINCLUDES="$(ISODEINCLUDEFLAG)" \
> EXLDFLAGS="$(ISODELIBFLAG)" EXLIBS="$(ISODELIBS)" edb2ldif; \
>@@ -61,3 +61,3 @@
> @if [ "$(HAVEISODE)" = "yes" ]; then \
>- $(MAKE) $(MFLAGS) CC=$(CC) EXINCLUDES="$(ISODEINCLUDEFLAG)" \
>+ $(MAKE) $(MFLAGS) CC="$(CC)" EXINCLUDES="$(ISODEINCLUDEFLAG)" \
> EXLDFLAGS="$(ISODELIBFLAG)" EXLIBS="$(ISODELIBS)" chlog2replog; \
>--- ./servers/slurpd/Make-template~ Wed Sep 16 02:32:21 1998
>+++ ./servers/slurpd/Make-template Wed Sep 16 03:25:58 1998
>@@ -41,3 +41,3 @@
> else \
>- make slurpd; \
>+ $(MAKE) slurpd; \
> fi
>--- ./Makefile~ Wed Sep 16 02:31:41 1998
>+++ ./Makefile Wed Sep 16 03:12:32 1998
>@@ -323,3 +323,3 @@
> fi; \
>- CC=$(CC); \
>+ CC="$(CC)"; \
> OLDIFS="$$IFS"; \
>@@ -344,3 +344,3 @@
> fi; \
>- echo "Copy Make-common.dist or Make-common.gmake to Make-common" \
>+ echo "Copy Make-common.dist or Make-common.gmake to Make-common" ; \
> echo " Edit as needed before making!" ; \
>
>--
>Hallvard
>
>