Please BSD make...

diff --git a/Makefile.org b/Makefile.org
index 826dc086cc34adef184d38d0b59c0950d7327c42..f469867d3f21315f08054c7c8736141563b95200 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -244,7 +244,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) -e $(BUILDENV) $$target ) || exit 1; \
        else \
                $(MAKE) $$dir; \
        fi; fi

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 843fe1e6157b15499c9f115c6549b15b28c2ce89..1f75cb50f42e0c597ef0d16514ca343e77459166 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -165,7 +165,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
          LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
        fi; \
        $(NEWMAKE) -f $(TOP)/Makefile.shared \
-               APPNAME=$(EXE) CC="$(CC)" LDFLAGS="$(LDFLAG)" \
+               APPNAME=$(EXE) CC="$(CC)" LDFLAGS="$(CFLAG)" \
                SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
                OBJECTS="$(PROGRAM).o $(E_OBJ)" \
                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index b22e08e9e276f0ea7e1f79d5d36be9f8ef99a6d0..bb9df4a642cffa4fcea622e38ccc74aa16730862 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -85,7 +85,7 @@ subdirs:
        @for i in $(SDIRS) ;\
        do \
        (cd $$i && echo "making all in crypto/$$i..." && \
-       $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
+       $(MAKE) -e INCLUDES='${INCLUDES}' all ) || exit 1; \
        done;
 
 files:

diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile.ssl
index 83950fac01be65e620cf4903f6862e946f227163..10b99712d6f4dff512b71d8a2e4aa21490c14cb0 100644 (file)
--- a/crypto/aes/Makefile.ssl
+++ b/crypto/aes/Makefile.ssl
@@ -21,6 +21,7 @@ AES_ASM_OBJ=aes_core.o aes_cbc.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 ASFLAGS= $(INCLUDES) $(ASFLAG)
+AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
 #TEST=aestest.c