diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-05-19 01:48:46 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-05-19 01:48:46 +0000 |
| commit | 3f516ce837aabadfe308fef9992cb4854231e3be (patch) | |
| tree | 7099497c4a0132a43c81fbffb4badf20bc5a9830 | |
| parent | 9f197f9da5489662cd0d1cbb2afd2b99d5548188 (diff) | |
| download | openssl-3f516ce837aabadfe308fef9992cb4854231e3be.tar.gz | |
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...
| -rw-r--r-- | Makefile.org | 8 | ||||
| -rw-r--r-- | crypto/Makefile | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.org b/Makefile.org index 5deb19a016..7fa4b52a96 100644 --- 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 c6c76c26ac..ee6e507dc7 100644 --- 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: |