SysV make [or least some of them] don't propogate command line macros to

recursively called make. So let's pass down BUILDENV as value too...

diff --git a/Makefile.org b/Makefile.org
index 5deb19a0167093dc4d8ef59e27f241f5565cbfcc..7fa4b52a96517d9264b412d94fe00c5650e2e5fb 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -150,12 +150,12 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
                CC='${CC}' CFLAG='${CFLAG}'                     \
                AS='${CC}' ASFLAG='${CFLAG} -c'                 \
                AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'    \
-               SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'           \
+               SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'           \
                INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'   \
-               MAKEDEPEND='$$(TOP)/util/domd $$(TOP) -MD $(MAKEDEPPROG)'\
+               MAKEDEPEND='$${TOP}/util/domd $${TOP} -MD ${MAKEDEPPROG}'\
                DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'    \
                MAKEDEPPROG='${MAKEDEPPROG}'                    \
-               LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
+               LDFLAGS='${LDFLAGS}' SHARED_LDFLAGS='${SHARED_LDFLAGS}' \
                KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'   \
                EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'       \
                SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' \
@@ -173,7 +173,7 @@ BUILDENV=   PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
 BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
        if [ -d "$$dir" ]; then \
                (cd $$dir && echo "making $$target in $$dir..." && \
-               $(MAKE) $(BUILDENV) $$target ) || exit 1; \
+               $(MAKE) $(BUILDENV) BUILDENV="$(BUILDENV)" $$target ) || exit 1; \
        else \
                $(MAKE) $$dir; \
        fi; fi

diff --git a/crypto/Makefile b/crypto/Makefile
index c6c76c26ac3553610a5950766a51f714ff15a267..ee6e507dc7467763c848154e73f62d0aaa590429 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -88,7 +88,7 @@ subdirs:
        @for i in $(SDIRS) ;\
        do \
        (cd $$i && echo "making all in crypto/$$i..." && \
-       $(MAKE) INCLUDES='${INCLUDES}' all ) || exit 1; \
+       $(MAKE) $(BUILDENV) INCLUDES='${INCLUDES}' all ) || exit 1; \
        done;
 
 files: