Commit 1314c344 authored by Bodo Möller's avatar Bodo Möller
Browse files

Obey $(PERL) when running util/mklink.pl. 

Submitted by:
Reviewed by:
PR:
parent cc98d9b6

Configure

+5 −1
Original line number Diff line number Diff line
@@ -582,8 +582,12 @@ if($IsWindows) { 
	open (OUT,">crypto/date.h") || die "Can't open date.h";

	printf OUT "#define DATE \"%s\"\n", scalar gmtime();

	close(OUT);

} else {

	if ( $perl =~ /./ ) {

		(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?;

	} else {

		(system 'make -f Makefile.ssl links') == 0 or exit $?;

	}

	(system 'make depend') == 0 or exit $? if $depflags ne "";

	&dofile("tools/c_rehash",$openssldir,'^DIR=',	'DIR=%s',);

	&dofile("util/mk1mf.pl",$openssldir,

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -239,10 +239,10 @@ files: 
links:

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@-mkdir -p include/openssl 2>/dev/null

	@$(TOP)/util/mklink.pl include/openssl $(EXHEADER)

	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)

	@for i in $(DIRS); do \

	(cd $$i && echo "making links in $$i..." && \

	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' links ) || exit 1; \

	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' links ) || exit 1; \

	done;

	@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)

crypto/Makefile.ssl

+3 −3
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ files: 


links:

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@$(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)

	@$(TOP)/util/mklink.pl ../test $(TEST)

	@$(TOP)/util/mklink.pl ../apps $(APPS)

	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)

	@$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)

	@$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@for i in $(SDIRS); do \

	(cd $$i; echo "making links in crypto/$$i..."; \

crypto/asn1/Makefile.ssl

+3 −3
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ files: 


links:

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@$(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)

	@$(TOP)/util/mklink.pl ../../test $(TEST)

	@$(TOP)/util/mklink.pl ../../apps $(APPS)

	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)

	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)

	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)



install:

	@for i in $(EXHEADER) ; \

crypto/bf/Makefile.ssl

+3 −3
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ files: 


links:

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@$(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)

	@$(TOP)/util/mklink.pl ../../test $(TEST)

	@$(TOP)/util/mklink.pl ../../apps $(APPS)

	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)

	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)

	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)



install:

	@for i in $(EXHEADER) ; \