51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
|
Upstream-Status: Inappropriate [configuration]
|
||
|
|
|
||
|
|
diff --git a/Makefile.org b/Makefile.org
|
||
|
|
index e87d623..25ff367 100644
|
||
|
|
--- a/Makefile.org
|
||
|
|
+++ b/Makefile.org
|
||
|
|
@@ -355,7 +355,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
|
||
|
|
@if [ "$(SHLIB_TARGET)" != "" ]; then \
|
||
|
|
if [ "$(FIPSCANLIB)" = "libfips" ]; then \
|
||
|
|
$(ARD) libcrypto.a fipscanister.o ; \
|
||
|
|
- $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
|
||
|
|
+ $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
|
||
|
|
$(AR) libcrypto.a fips/fipscanister.o ; \
|
||
|
|
else \
|
||
|
|
if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
|
||
|
|
@@ -373,7 +373,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
|
||
|
|
@if [ "$(SHLIB_TARGET)" != "" ]; then \
|
||
|
|
shlibdeps=-lcrypto; \
|
||
|
|
[ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
|
||
|
|
- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
|
||
|
|
+ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
|
||
|
|
else \
|
||
|
|
echo "There's no support for shared libraries on this platform" >&2 ; \
|
||
|
|
exit 1; \
|
||
|
|
diff --git a/crypto/Makefile b/crypto/Makefile
|
||
|
|
index 6557f2b..a69bf7c 100644
|
||
|
|
--- a/crypto/Makefile
|
||
|
|
+++ b/crypto/Makefile
|
||
|
|
@@ -103,7 +103,7 @@ $(LIB): $(LIBOBJ)
|
||
|
|
|
||
|
|
shared: buildinf.h lib subdirs
|
||
|
|
if [ -n "$(SHARED_LIBS)" ]; then \
|
||
|
|
- (cd ..; $(MAKE) $(SHARED_LIB)); \
|
||
|
|
+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
|
||
|
|
fi
|
||
|
|
|
||
|
|
libs:
|
||
|
|
diff --git a/ssl/Makefile b/ssl/Makefile
|
||
|
|
index 5ac3507..77ea2bd 100644
|
||
|
|
--- a/ssl/Makefile
|
||
|
|
+++ b/ssl/Makefile
|
||
|
|
@@ -62,7 +62,7 @@ lib: $(LIBOBJ)
|
||
|
|
|
||
|
|
shared: lib
|
||
|
|
if [ -n "$(SHARED_LIBS)" ]; then \
|
||
|
|
- (cd ..; $(MAKE) $(SHARED_LIB)); \
|
||
|
|
+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
|
||
|
|
fi
|
||
|
|
|
||
|
|
files:
|