X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=apps%2FMakefile.ssl;h=dc5b3d77548bf84b04e5435a0cc7afbfd298f06a;hb=4aca9297dcabc76cbe8ca2bb47dea25183f23830;hp=b85c675b500e28f78187a5713eb1fd54435c948e;hpb=69c922f5d27ea1fef4f67ed8b143540b0e33c364;p=openssl.git

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index b85c675b50..dc5b3d7754 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -38,7 +38,7 @@ LIBSSL=-L.. -lssl
 
 PROGRAM= openssl
 
-SCRIPTS=CA.sh CA.pl der_chop
+SCRIPTS=CA.sh CA.pl
 
 EXE= $(PROGRAM)$(EXE_EXT)
 
@@ -94,7 +94,8 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
 		shlib_target="$(SHLIB_TARGET)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=req LDFLAGS="$(CFLAG)" \
+		APPNAME=req CC="$(CC)" CFLAGS="$(CFLAGS)" \
+		LDFLAGS="$(LDFLAG)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \
 		LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -164,14 +165,15 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 	  LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(EXE) LDFLAGS="$(CFLAG)" \
+		APPNAME=$(EXE) CC="$(CC)" CFLAGS="$(CFLAG)" \
+		LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(PROGRAM).o $(E_OBJ)" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
 		link_app.$${shlib_target}
-	-(cd ..; 
+	-(cd ..; \
+	  OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \
 	  if [ -n "$(SHARED_LIBS)" ]; then \
-	    OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \
 	    LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \
 	    DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \
 	    SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
@@ -179,7 +181,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 	    if [ "$(PLATFORM)" = "Cygwin" ]; then \
 	      PATH="`pwd`:$$PATH"; \
 	    fi; \
-	    LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
+	    LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \
 	    export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
 	    export LD_PRELOAD; \
 	  fi; \