From 99aab1619f02b184f140150c72276bf55716cc42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulf=20M=C3=B6ller?= Date: Thu, 1 Apr 1999 12:34:33 +0000 Subject: [PATCH] New Makefile variables $(RANLIB) and $(PERL). --- CHANGES | 3 +++ Configure | 23 +++++++++++++++++++++++ Makefile.org | 14 ++++++++------ apps/Makefile.ssl | 6 +++--- config | 30 +++++++++++++++++++++++++++--- crypto/Makefile.ssl | 12 ++++++------ crypto/asn1/Makefile.ssl | 10 +++++----- crypto/bf/Makefile.ssl | 9 ++++----- crypto/bf/Makefile.uni | 20 ++++---------------- crypto/bio/Makefile.ssl | 10 +++++----- crypto/bn/Makefile.ssl | 16 ++++++++-------- crypto/buffer/Makefile.ssl | 10 +++++----- crypto/cast/Makefile.ssl | 8 ++++---- crypto/cast/Makefile.uni | 3 ++- crypto/comp/Makefile.ssl | 10 +++++----- crypto/conf/Makefile.ssl | 10 +++++----- crypto/des/Makefile.ssl | 10 +++++----- crypto/des/Makefile.uni | 20 ++++---------------- crypto/des/ranlib.sh | 23 ----------------------- crypto/dh/Makefile.ssl | 10 +++++----- crypto/dsa/Makefile.ssl | 10 +++++----- crypto/err/Makefile.ssl | 6 +++--- crypto/evp/Makefile.ssl | 10 +++++----- crypto/hmac/Makefile.ssl | 6 +++--- crypto/idea/Makefile.ssl | 6 +++--- crypto/idea/Makefile.uni | 3 ++- crypto/lhash/Makefile.ssl | 6 +++--- crypto/md2/Makefile.ssl | 6 +++--- crypto/md5/Makefile.ssl | 8 ++++---- crypto/md5/Makefile.uni | 3 ++- crypto/mdc2/Makefile.ssl | 6 +++--- crypto/objects/Makefile.ssl | 12 ++++++------ crypto/pem/Makefile.ssl | 12 ++++++------ crypto/pkcs12/Makefile.ssl | 10 +++++----- crypto/pkcs7/Makefile.ssl | 10 +++++----- crypto/rand/Makefile.ssl | 6 +++--- crypto/ranlib.sh | 23 ----------------------- crypto/rc2/Makefile.ssl | 6 +++--- crypto/rc2/Makefile.uni | 3 ++- crypto/rc4/Makefile.ssl | 8 ++++---- crypto/rc4/Makefile.uni | 3 ++- crypto/rc5/Makefile.ssl | 8 ++++---- crypto/rc5/Makefile.uni | 3 ++- crypto/ripemd/Makefile.ssl | 8 ++++---- crypto/ripemd/Makefile.uni | 2 +- crypto/rsa/Makefile.ssl | 10 +++++----- crypto/sha/Makefile.ssl | 8 ++++---- crypto/sha/Makefile.uni | 2 +- crypto/stack/Makefile.ssl | 6 +++--- crypto/txt_db/Makefile.ssl | 6 +++--- crypto/x509/Makefile.ssl | 10 +++++----- crypto/x509v3/Makefile.ssl | 10 +++++----- makefile.one | 2 +- rsaref/Makefile.ssl | 10 +++++----- ssl/Makefile.ssl | 10 +++++----- test/Makefile.ssl | 4 ++-- tools/Makefile.ssl | 4 ++-- util/mk1mf.pl | 5 ----- util/pl/unix.pl | 15 ++++++++++++++- util/ranlib.sh | 23 ----------------------- util/sep_lib.sh | 3 --- 61 files changed, 269 insertions(+), 300 deletions(-) delete mode 100644 crypto/des/ranlib.sh delete mode 100644 crypto/ranlib.sh delete mode 100755 util/ranlib.sh diff --git a/CHANGES b/CHANGES index b1fa3bbcec..e1d946024a 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ Changes between 0.9.2b and 0.9.3 + *) New variables $(RANLIB) and $(PERL) in the Makefiles. + [Ulf Möller] + *) New config option to avoid instructions that are illegal on the 80386. The default code is faster, but requires at least a 486. [Ulf Möller] diff --git a/Configure b/Configure index 50fe9627d2..bf14830caf 100755 --- a/Configure +++ b/Configure @@ -273,6 +273,11 @@ my $md5_obj=""; my $sha1_obj=""; my $rmd160_obj=""; my $processor=""; +my $ranlib; +my $perl; + +$ranlib=&which("ranlib") or $ranlib="true"; +$perl=&which("perl5") or $perl=&which("perl"); if ($#ARGV < 0) { @@ -393,6 +398,8 @@ while () s/^SHA1_ASM_OBJ=.*$/SHA1_ASM_OBJ= $sha1_obj/; s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/; s/^PROCESSOR=.*/PROCESSOR= $processor/; + s/^RANLIB=.*/RANLIB= $ranlib/; + s/^PERL=.*/PERL= $perl/; print OUT $_."\n"; } close(IN); @@ -411,6 +418,8 @@ print "MD5_OBJ_ASM =$md5_obj\n"; print "SHA1_OBJ_ASM =$sha1_obj\n"; print "RMD160_OBJ_ASM=$rmd160_obj\n"; print "PROCESSOR =$processor\n"; +print "RANLIB =$ranlib\n"; +print "PERL =$perl\n"; my $des_ptr=0; my $des_risc1=0; @@ -713,3 +722,17 @@ sub Rename sub file_new { my($a)=@_; $a =~ s/(\.[^.]+$|$)/.new/; $a; } sub file_old { my($a)=@_; $a =~ s/(\.[^.]+$|$)/.old/; $a; } + +sub which + { + my($name)=@_; + my $path; + foreach $path (split /:/, $ENV{PATH}) + { + if (-x "$path/$name") + { + return "$path/$name"; + } + } + } + diff --git a/Makefile.org b/Makefile.org index 3828a1eba2..3fe81cc56b 100644 --- a/Makefile.org +++ b/Makefile.org @@ -44,6 +44,8 @@ CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD PEX_LIBS= -L. -L.. -L../.. -L../../.. EX_LIBS= AR=ar r +RANLIB= ranlib +PERL= perl # Set BN_ASM to bn_asm.o if you want to use the C version BN_ASM= bn_asm.o @@ -167,14 +169,14 @@ all: Makefile.ssl @for i in $(DIRS) ;\ do \ (cd $$i && echo "making all in $$i..." && \ - $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' 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}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='$(PROCESSOR)' all ) || exit 1; \ + $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' 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}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ done; sub_all: @for i in $(DIRS) ;\ do \ (cd $$i && echo "making all 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}' PROCESSOR='$(PROCESSOR)' all ) || 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}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ done; Makefile.ssl: Makefile.org @@ -202,11 +204,11 @@ clean: done makefile.one: files - perl util/mk1mf.pl >makefile.one; \ + $(PERL) util/mk1mf.pl >makefile.one; \ sh util/do_ms.sh files: MINFO - perl $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO @for i in $(DIRS) ;\ do \ (cd $$i && echo "making 'files' in $$i..." && \ @@ -278,7 +280,7 @@ tar: ls -l ../$(TARFILE).gz dist: - perl Configure dist + $(PERL) Configure dist @$(MAKE) dist_pem_h @$(MAKE) SDIRS='${SDIRS}' clean @$(MAKE) tar @@ -301,7 +303,7 @@ install: all do \ ( echo installing $$i; \ cp $$i $(INSTALLTOP)/lib; \ - sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \ + $(RANLIB) $(INSTALLTOP)/lib/$$i; \ chmod 644 $(INSTALLTOP)/lib/$$i ); \ done diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index 4c87bd35e4..e9c22d15f2 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -84,7 +84,7 @@ sreq.o: req.c $(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO install: @for i in $(EXE) $(SCRIPTS); \ @@ -111,7 +111,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) errors: @@ -132,7 +132,7 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) @(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs) progs.h: - perl ./progs.pl $(E_EXE) >progs.h + $(PERL) ./progs.pl $(E_EXE) >progs.h $(RM) $(PROGRAM).o # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/config b/config index 55fdbdede2..78aac51b50 100755 --- a/config +++ b/config @@ -332,10 +332,34 @@ if [ -z "$OUT" ]; then OUT="$CC" fi +if [ ".$PERL" = . ] ; then + for i in . `echo $PATH | sed 's/:/ /g'`; do + if [ -f "$i/perl5" ] ; then + PERL="$i/perl5" + break; + fi; + done +fi + +if [ ".$PERL" = . ] ; then + for i in . `echo $PATH | sed 's/:/ /g'`; do + if [ -f "$i/perl" ] ; then + PERL="$i/perl" + break; + fi; + done +fi + +if $PERL -e 'exit($]>=5.0);' ; then + echo "You need Perl 5." + exit 1 +fi + # run Configure to check to see if we need to specify the # compiler for the platform ... in which case we add it on # the end ... otherwise we leave it off -perl ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null + +$PERL ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null if [ $? = "0" ]; then OUT="$OUT-$CC" fi @@ -348,9 +372,9 @@ OUT="$PREFIX$OUT" echo Configuring for $OUT if [ "$TEST" = "true" ]; then - echo ./Configure $OUT $options + echo $PERL ./Configure $OUT $options else - perl ./Configure $OUT $options + $PERL ./Configure $OUT $options fi ) diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 1a03301060..a0c972276c 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -60,7 +60,7 @@ subdirs: done; files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO @for i in $(SDIRS) ;\ do \ (cd $$i; echo "making 'files' in crypto/$$i..."; \ @@ -80,7 +80,7 @@ links: lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib libs: @@ -133,7 +133,7 @@ clean: done; dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) @for i in $(SDIRS) ;\ do \ @@ -144,11 +144,11 @@ dclean: errors: errgen $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) err/err_genc.pl -s $(ERR).h $(ERRC).c errgen: - perl ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c + $(PERL) ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c @for i in $(SDIRS) ;\ do \ (cd $$i; echo "making errors in crypto/$$i..."; \ diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl index 5f5750b1bc..fb6d8574f8 100644 --- a/crypto/asn1/Makefile.ssl +++ b/crypto/asn1/Makefile.ssl @@ -75,11 +75,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -106,7 +106,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -115,8 +115,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile.ssl index 2f92edaafb..68e0b88cd2 100644 --- a/crypto/bf/Makefile.ssl +++ b/crypto/bf/Makefile.ssl @@ -42,7 +42,7 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -64,14 +64,13 @@ asm/bx86bsdi.o: asm/bx86unix.cpp $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o asm/bx86unix.cpp: - (cd asm; perl bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp) + (cd asm; $(PERL) bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(TOP)/util/point.sh ../../doc/blowfish.doc blowfish.doc @$(TOP)/util/mklink.sh ../../include $(EXHEADER) @$(TOP)/util/mklink.sh ../../test $(TEST) @$(TOP)/util/mklink.sh ../../apps $(APPS) @@ -95,7 +94,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/bf/Makefile.uni b/crypto/bf/Makefile.uni index 9ba5b0c854..f67e5ca23b 100644 --- a/crypto/bf/Makefile.uni +++ b/crypto/bf/Makefile.uni @@ -29,6 +29,7 @@ CFLAG= -O3 -fomit-frame-pointer CFLAGS=$(OPTS) $(CFLAG) CPP=$(CC) -E AS=as +RANLIB=ranlib # Assember version of bf_encrypt(). BF_ENC=bf_enc.o # normal C version @@ -105,9 +106,7 @@ test: all $(BLIB): $(LIBOBJ) /bin/rm -f $(BLIB) ar cr $(BLIB) $(LIBOBJ) - -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \ - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \ - else exit 0; fi; fi + $(RANLIB) $(BLIB) bftest: bftest.o $(BLIB) $(CC) $(CFLAGS) -o bftest bftest.o $(BLIB) @@ -142,25 +141,14 @@ install: $(BLIB) if test $(INSTALLTOP); then \ echo SSL style install; \ cp $(BLIB) $(INSTALLTOP)/lib; \ - if test -s /bin/ranlib; then \ - /bin/ranlib $(INSTALLTOP)/lib/$(BLIB); \ - else \ - if test -s /usr/bin/ranlib; then \ - /usr/bin/ranlib $(INSTALLTOP)/lib/$(BLIB); \ - fi; fi; \ + $(RANLIB) $(BLIB); \ chmod 644 $(INSTALLTOP)/lib/$(BLIB); \ cp blowfish.h $(INSTALLTOP)/include; \ chmod 644 $(INSTALLTOP)/include/blowfish.h; \ else \ echo Standalone install; \ cp $(BLIB) $(LIBDIR)/$(BLIB); \ - if test -s /bin/ranlib; then \ - /bin/ranlib $(LIBDIR)/$(BLIB); \ - else \ - if test -s /usr/bin/ranlib; then \ - /usr/bin/ranlib $(LIBDIR)/$(BLIB); \ - fi; \ - fi; \ + $(RANLIB) $(BLIB); \ chmod 644 $(LIBDIR)/$(BLIB); \ cp blowfish.h $(INCDIR)/blowfish.h; \ chmod 644 $(INCDIR)/blowfish.h; \ diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl index 6160a29008..4afc36042f 100644 --- a/crypto/bio/Makefile.ssl +++ b/crypto/bio/Makefile.ssl @@ -47,11 +47,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -78,7 +78,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -87,8 +87,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl index d34cdbd4cf..1f03090ed3 100644 --- a/crypto/bn/Makefile.ssl +++ b/crypto/bn/Makefile.ssl @@ -57,7 +57,7 @@ knuth.fast: bn_knuth.c lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -93,10 +93,10 @@ asm/co86bsdi.o: asm/co86unix.cpp $(CPP) -DBSDI asm/co86unix.cpp | sed 's/ :/:/' | as -o asm/co86bsdi.o asm/bn86unix.cpp: asm/bn-586.pl - (cd asm; perl bn-586.pl cpp >bn86unix.cpp ) + (cd asm; $(PERL) bn-586.pl cpp >bn86unix.cpp ) asm/co86unix.cpp: asm/co-586.pl - (cd asm; perl co-586.pl cpp >co86unix.cpp ) + (cd asm; $(PERL) co-586.pl cpp >co86unix.cpp ) # MIPS 64 bit assember asm/mips3.o: asm/mips3.s @@ -107,7 +107,7 @@ asm/mips1.o: asm/mips1.s /usr/bin/as -O2 -o asm/mips1.o asm/mips1.s files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -142,7 +142,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -151,9 +151,9 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).org # special case .org - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).org # special case .org + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile.ssl index cbd700b435..8142ac2ff8 100644 --- a/crypto/buffer/Makefile.ssl +++ b/crypto/buffer/Makefile.ssl @@ -39,11 +39,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -70,7 +70,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -79,8 +79,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl index 0834c09c13..a976ea1ff1 100644 --- a/crypto/cast/Makefile.ssl +++ b/crypto/cast/Makefile.ssl @@ -45,7 +45,7 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -67,10 +67,10 @@ asm/cx86bsdi.o: asm/cx86unix.cpp $(CPP) -DBSDI asm/cx86unix.cpp | sed 's/ :/:/' | as -o asm/cx86bsdi.o asm/cx86unix.cpp: asm/cast-586.pl - (cd asm; perl cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp) + (cd asm; $(PERL) cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -97,7 +97,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/cast/Makefile.uni b/crypto/cast/Makefile.uni index 780073e75b..a5870897cf 100644 --- a/crypto/cast/Makefile.uni +++ b/crypto/cast/Makefile.uni @@ -24,6 +24,7 @@ MAKE= make MAKEDEPEND= makedepend MAKEFILE= Makefile.uni AR= ar r +RANLIB= ranlib CAST_ENC=c_enc.o # or use @@ -55,7 +56,7 @@ all: $(LIB) $(TEST) $(APPS) $(LIB): $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/ranlib.sh $(LIB) + $(RANLIB) $(LIB) # elf asm/cx86-elf.o: asm/cx86unix.cpp $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o diff --git a/crypto/comp/Makefile.ssl b/crypto/comp/Makefile.ssl index 842443a6a4..79970df32c 100644 --- a/crypto/comp/Makefile.ssl +++ b/crypto/comp/Makefile.ssl @@ -42,11 +42,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -73,7 +73,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -88,8 +88,8 @@ comp.err: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl index dc396f0024..614da0a5c4 100644 --- a/crypto/conf/Makefile.ssl +++ b/crypto/conf/Makefile.ssl @@ -40,11 +40,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -71,7 +71,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -80,8 +80,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl index c7b5dc4502..46be0c8f89 100644 --- a/crypto/des/Makefile.ssl +++ b/crypto/des/Makefile.ssl @@ -54,7 +54,7 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -90,13 +90,13 @@ asm/yx86bsdi.o: asm/yx86unix.cpp $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o asm/dx86unix.cpp: asm/des-586.pl - (cd asm; perl des-586.pl cpp >dx86unix.cpp) + (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp) asm/yx86unix.cpp: asm/crypt586.pl - (cd asm; perl crypt586.pl cpp >yx86unix.cpp) + (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -126,7 +126,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/des/Makefile.uni b/crypto/des/Makefile.uni index 8f1759748a..ec19d75b81 100644 --- a/crypto/des/Makefile.uni +++ b/crypto/des/Makefile.uni @@ -51,6 +51,7 @@ CFLAG= -O3 -fomit-frame-pointer CFLAGS=$(OPTS) $(CFLAG) CPP=$(CC) -E AS=as +RANLIB=ranlib # Assember version of des_encrypt*(). DES_ENC=des_enc.o fcrypt_b.o # normal C version @@ -169,9 +170,7 @@ test: all $(DLIB): $(OBJ) /bin/rm -f $(DLIB) ar cr $(DLIB) $(OBJ) - -if test -s /bin/ranlib; then /bin/ranlib $(DLIB); \ - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(DLIB); \ - else exit 0; fi; fi + $(RANLIB) $(DLIB) des_opts: des_opts.o $(DLIB) $(CC) $(CFLAGS) -o des_opts des_opts.o $(DLIB) @@ -231,25 +230,14 @@ install: des if test $(INSTALLTOP); then \ echo SSL style install; \ cp $(DLIB) $(INSTALLTOP)/lib; \ - if test -s /bin/ranlib; then \ - /bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \ - else \ - if test -s /usr/bin/ranlib; then \ - /usr/bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \ - fi; fi; \ + $(RANLIB) $(DLIB); \ chmod 644 $(INSTALLTOP)/lib/$(DLIB); \ cp des.h $(INSTALLTOP)/include; \ chmod 644 $(INSTALLTOP)/include/des.h; \ else \ echo Standalone install; \ cp $(DLIB) $(LIBDIR)/$(DLIB); \ - if test -s /bin/ranlib; then \ - /bin/ranlib $(LIBDIR)/$(DLIB); \ - else \ - if test -s /usr/bin/ranlib; then \ - /usr/bin/ranlib $(LIBDIR)/$(DLIB); \ - fi; \ - fi; \ + $(RANLIB) $(DLIB); \ chmod 644 $(LIBDIR)/$(DLIB); \ cp des $(BINDIR)/des; \ chmod 711 $(BINDIR)/des; \ diff --git a/crypto/des/ranlib.sh b/crypto/des/ranlib.sh deleted file mode 100644 index 543f712c6b..0000000000 --- a/crypto/des/ranlib.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -cwd=`pwd` -cd /tmp - -if [ -s /bin/ranlib ] ; then - RL=/bin/ranlib -else if [ -s /usr/bin/ranlib ] ; then - RL=/usr/bin/ranlib -fi -fi - -if [ "x$RL" != "x" ] -then - case "$1" in - /*) - $RL "$1" - ;; - *) - $RL "$cwd/$1" - ;; - esac -fi diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl index 3f94558257..acec3c60fe 100644 --- a/crypto/dh/Makefile.ssl +++ b/crypto/dh/Makefile.ssl @@ -39,11 +39,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -70,7 +70,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -79,8 +79,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl index b1e01ab82b..382473a8a5 100644 --- a/crypto/dsa/Makefile.ssl +++ b/crypto/dsa/Makefile.ssl @@ -39,11 +39,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -70,7 +70,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -79,8 +79,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl index 6fcc07c121..9cf90c11ab 100644 --- a/crypto/err/Makefile.ssl +++ b/crypto/err/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl index 4ed427b7a9..11cc0062ef 100644 --- a/crypto/evp/Makefile.ssl +++ b/crypto/evp/Makefile.ssl @@ -66,11 +66,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -97,7 +97,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -106,8 +106,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/hmac/Makefile.ssl b/crypto/hmac/Makefile.ssl index a4aa6e14b2..52a216739f 100644 --- a/crypto/hmac/Makefile.ssl +++ b/crypto/hmac/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/idea/Makefile.ssl b/crypto/idea/Makefile.ssl index 06199ae2a4..d29abbd957 100644 --- a/crypto/idea/Makefile.ssl +++ b/crypto/idea/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/idea/Makefile.uni b/crypto/idea/Makefile.uni index 354123dac8..c83339ad6d 100644 --- a/crypto/idea/Makefile.uni +++ b/crypto/idea/Makefile.uni @@ -15,6 +15,7 @@ MAKE= make MAKEDEPEND= makedepend MAKEFILE= Makefile.uni AR= ar r +RANLIB= ranlib IDEA_ENC=i_cbc.o @@ -39,7 +40,7 @@ all: $(LIB) $(TEST) $(APPS) $(LIB): $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/ranlib.sh $(LIB) + $(RANLIB) $(LIB) test: $(TEST) ./$(TEST) diff --git a/crypto/lhash/Makefile.ssl b/crypto/lhash/Makefile.ssl index 1e83078dfe..f30a7efe1c 100644 --- a/crypto/lhash/Makefile.ssl +++ b/crypto/lhash/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/md2/Makefile.ssl b/crypto/md2/Makefile.ssl index 041c2b0628..8f415be5d8 100644 --- a/crypto/md2/Makefile.ssl +++ b/crypto/md2/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/md5/Makefile.ssl b/crypto/md5/Makefile.ssl index bf066a955f..3a7b009970 100644 --- a/crypto/md5/Makefile.ssl +++ b/crypto/md5/Makefile.ssl @@ -40,7 +40,7 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -62,10 +62,10 @@ asm/mx86bsdi.o: asm/mx86unix.cpp $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | as -o asm/mx86bsdi.o asm/mx86unix.cpp: asm/md5-586.pl - (cd asm; perl md5-586.pl cpp >mx86unix.cpp) + (cd asm; $(PERL) md5-586.pl cpp >mx86unix.cpp) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -92,7 +92,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/md5/Makefile.uni b/crypto/md5/Makefile.uni index 54685712db..d21c72f3ea 100644 --- a/crypto/md5/Makefile.uni +++ b/crypto/md5/Makefile.uni @@ -19,6 +19,7 @@ MAKE= make MAKEDEPEND= makedepend MAKEFILE= Makefile.uni AR= ar r +RANLIB= ranlib MD5_ASM_OBJ= @@ -43,7 +44,7 @@ all: $(LIB) $(TEST) $(APPS) $(LIB): $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/ranlib.sh $(LIB) + $(RANLIB) $(LIB) # elf asm/mx86-elf.o: asm/mx86unix.cpp diff --git a/crypto/mdc2/Makefile.ssl b/crypto/mdc2/Makefile.ssl index 590ad18318..0707db3c5f 100644 --- a/crypto/mdc2/Makefile.ssl +++ b/crypto/mdc2/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl index 04bec6c63b..2397287f11 100644 --- a/crypto/objects/Makefile.ssl +++ b/crypto/objects/Makefile.ssl @@ -38,15 +38,15 @@ top: all: obj_dat.h lib obj_dat.h: objects.h obj_dat.pl - perl ./obj_dat.pl < objects.h > obj_dat.h + $(PERL) ./obj_dat.pl < objects.h > obj_dat.h lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -73,7 +73,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -82,8 +82,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl index e7c0a03202..60da66aa8a 100644 --- a/crypto/pem/Makefile.ssl +++ b/crypto/pem/Makefile.ssl @@ -50,11 +50,11 @@ $(CTX_SIZE): $(CTX_SIZE).o lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: $(EXHEADER) @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -81,7 +81,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(CTX_SIZE).c $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -90,9 +90,9 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).org # SPECIAL CASE .org - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).org # SPECIAL CASE .org + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile.ssl index a53e1c425f..929f0fb015 100644 --- a/crypto/pkcs12/Makefile.ssl +++ b/crypto/pkcs12/Makefile.ssl @@ -45,11 +45,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -76,7 +76,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -85,7 +85,7 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/pkcs7/Makefile.ssl b/crypto/pkcs7/Makefile.ssl index 563c9fd3bf..1a38f10f37 100644 --- a/crypto/pkcs7/Makefile.ssl +++ b/crypto/pkcs7/Makefile.ssl @@ -41,11 +41,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -72,7 +72,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -81,8 +81,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl index 7325f7a3d4..671e4891c7 100644 --- a/crypto/rand/Makefile.ssl +++ b/crypto/rand/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/ranlib.sh b/crypto/ranlib.sh deleted file mode 100644 index 543f712c6b..0000000000 --- a/crypto/ranlib.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -cwd=`pwd` -cd /tmp - -if [ -s /bin/ranlib ] ; then - RL=/bin/ranlib -else if [ -s /usr/bin/ranlib ] ; then - RL=/usr/bin/ranlib -fi -fi - -if [ "x$RL" != "x" ] -then - case "$1" in - /*) - $RL "$1" - ;; - *) - $RL "$cwd/$1" - ;; - esac -fi diff --git a/crypto/rc2/Makefile.ssl b/crypto/rc2/Makefile.ssl index 9eecdfbc8f..81feadd52f 100644 --- a/crypto/rc2/Makefile.ssl +++ b/crypto/rc2/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/rc2/Makefile.uni b/crypto/rc2/Makefile.uni index e50b3f2d19..4dc20c6fcf 100644 --- a/crypto/rc2/Makefile.uni +++ b/crypto/rc2/Makefile.uni @@ -15,6 +15,7 @@ MAKE= make MAKEDEPEND= makedepend MAKEFILE= Makefile.uni AR= ar r +RANLIB= ranlib IDEA_ENC=rc2_cbc.o @@ -39,7 +40,7 @@ all: $(LIB) $(TEST) $(APPS) $(LIB): $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/ranlib.sh $(LIB) + $(RANLIB) $(LIB) test: $(TEST) ./$(TEST) diff --git a/crypto/rc4/Makefile.ssl b/crypto/rc4/Makefile.ssl index 61c1354216..0e4b384265 100644 --- a/crypto/rc4/Makefile.ssl +++ b/crypto/rc4/Makefile.ssl @@ -44,7 +44,7 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -66,10 +66,10 @@ asm/rx86bsdi.o: asm/rx86unix.cpp $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o asm/rx86unix.cpp: asm/rc4-586.pl - (cd asm; perl rc4-586.pl cpp >rx86unix.cpp) + (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -96,7 +96,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/rc4/Makefile.uni b/crypto/rc4/Makefile.uni index 79dc17b8d1..855d9e50f3 100644 --- a/crypto/rc4/Makefile.uni +++ b/crypto/rc4/Makefile.uni @@ -19,6 +19,7 @@ MAKE= make MAKEDEPEND= makedepend MAKEFILE= Makefile.uni AR= ar r +RANLIB= ranlib RC4_ENC=rc4_enc.o # or use @@ -48,7 +49,7 @@ all: $(LIB) $(TEST) $(APPS) $(LIB): $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/ranlib.sh $(LIB) + $(RANLIB) $(LIB) # elf asm/rx86-elf.o: asm/rx86unix.cpp diff --git a/crypto/rc5/Makefile.ssl b/crypto/rc5/Makefile.ssl index c212aea8b4..68794f5059 100644 --- a/crypto/rc5/Makefile.ssl +++ b/crypto/rc5/Makefile.ssl @@ -42,7 +42,7 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -64,10 +64,10 @@ asm/r586bsdi.o: asm/r586unix.cpp $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o asm/r586unix.cpp: - (cd asm; perl rc5-586.pl cpp >r586unix.cpp) + (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -94,7 +94,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/rc5/Makefile.uni b/crypto/rc5/Makefile.uni index e50b3f2d19..4dc20c6fcf 100644 --- a/crypto/rc5/Makefile.uni +++ b/crypto/rc5/Makefile.uni @@ -15,6 +15,7 @@ MAKE= make MAKEDEPEND= makedepend MAKEFILE= Makefile.uni AR= ar r +RANLIB= ranlib IDEA_ENC=rc2_cbc.o @@ -39,7 +40,7 @@ all: $(LIB) $(TEST) $(APPS) $(LIB): $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/ranlib.sh $(LIB) + $(RANLIB) $(LIB) test: $(TEST) ./$(TEST) diff --git a/crypto/ripemd/Makefile.ssl b/crypto/ripemd/Makefile.ssl index f3304e8fc2..221572aef2 100644 --- a/crypto/ripemd/Makefile.ssl +++ b/crypto/ripemd/Makefile.ssl @@ -40,7 +40,7 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -62,10 +62,10 @@ asm/rm86bsdi.o: asm/rm86unix.cpp $(CPP) -DBSDI asm/rm86unix.cpp | sed 's/ :/:/' | as -o asm/rm86bsdi.o asm/rm86unix.cpp: asm/rmd-586.pl - (cd asm; perl rmd-586.pl cpp >rm86unix.cpp) + (cd asm; $(PERL) rmd-586.pl cpp >rm86unix.cpp) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -92,7 +92,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/ripemd/Makefile.uni b/crypto/ripemd/Makefile.uni index 54685712db..5310020eb1 100644 --- a/crypto/ripemd/Makefile.uni +++ b/crypto/ripemd/Makefile.uni @@ -43,7 +43,7 @@ all: $(LIB) $(TEST) $(APPS) $(LIB): $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/ranlib.sh $(LIB) + $(RANLIB) $(LIB) # elf asm/mx86-elf.o: asm/mx86unix.cpp diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl index d829e96f8d..3703278188 100644 --- a/crypto/rsa/Makefile.ssl +++ b/crypto/rsa/Makefile.ssl @@ -41,11 +41,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -72,7 +72,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -81,8 +81,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err $(ERR).h - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl index 190da3a6cf..19986707e6 100644 --- a/crypto/sha/Makefile.ssl +++ b/crypto/sha/Makefile.ssl @@ -39,7 +39,7 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib # elf @@ -61,10 +61,10 @@ asm/sx86bsdi.o: asm/sx86unix.cpp $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o asm/sx86unix.cpp: - (cd asm; perl sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp) + (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -91,7 +91,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/sha/Makefile.uni b/crypto/sha/Makefile.uni index f3236755b2..b7ec5caa4e 100644 --- a/crypto/sha/Makefile.uni +++ b/crypto/sha/Makefile.uni @@ -49,7 +49,7 @@ all: $(LIB) $(TEST) $(APPS) $(LIB): $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/ranlib.sh $(LIB) + $(RANLIB) $(LIB) # elf asm/sx86-elf.o: asm/sx86unix.cpp diff --git a/crypto/stack/Makefile.ssl b/crypto/stack/Makefile.ssl index 01ad0f0984..0a9d125671 100644 --- a/crypto/stack/Makefile.ssl +++ b/crypto/stack/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/txt_db/Makefile.ssl b/crypto/txt_db/Makefile.ssl index 929354b851..736eabb9ab 100644 --- a/crypto/txt_db/Makefile.ssl +++ b/crypto/txt_db/Makefile.ssl @@ -37,11 +37,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -68,7 +68,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl index 4f61d6997b..4b9d095947 100644 --- a/crypto/x509/Makefile.ssl +++ b/crypto/x509/Makefile.ssl @@ -51,11 +51,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -82,7 +82,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -91,8 +91,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl index 5c27afcc82..9eacfda21a 100644 --- a/crypto/x509v3/Makefile.ssl +++ b/crypto/x509v3/Makefile.ssl @@ -43,11 +43,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -74,7 +74,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -83,8 +83,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/makefile.one b/makefile.one index 7aca31d1e0..c93a959ea2 100644 --- a/makefile.one +++ b/makefile.one @@ -60,7 +60,7 @@ INC_D=outinc CP=cp RM=rm -f -RANLIB=$(SRC_D)/util/ranlib.sh +RANLIB=ranlib MKDIR=mkdir MKLIB=ar r MLFLAGS= diff --git a/rsaref/Makefile.ssl b/rsaref/Makefile.ssl index 7b389960e6..18179ea8c9 100644 --- a/rsaref/Makefile.ssl +++ b/rsaref/Makefile.ssl @@ -39,11 +39,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -71,7 +71,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -80,8 +80,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../crypto/err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../crypto/err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index 8dfa3d0a2d..8f18f7fe02 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -55,11 +55,11 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - sh $(TOP)/util/ranlib.sh $(LIB) + $(RANLIB) $(LIB) @touch lib files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -86,7 +86,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: @@ -95,8 +95,8 @@ clean: errors: $(ERRC).c $(ERRC).c: $(ERR).err - perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../crypto/err/err_genc.pl -s $(ERR).h $(ERRC).c + $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h + $(PERL) ../crypto/err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/test/Makefile.ssl b/test/Makefile.ssl index 5c030eea6a..d9a7c62b53 100644 --- a/test/Makefile.ssl +++ b/test/Makefile.ssl @@ -79,7 +79,7 @@ all: exe exe: $(EXE) files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @@$(TOP)/util/point.sh Makefile.ssl Makefile @@ -217,7 +217,7 @@ depend: $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC) dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/tools/Makefile.ssl b/tools/Makefile.ssl index 23e767c841..f12f85adb9 100644 --- a/tools/Makefile.ssl +++ b/tools/Makefile.ssl @@ -28,7 +28,7 @@ install: done; files: - perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO links: @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -42,7 +42,7 @@ errors: depend: dclean: - perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) clean: diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 11f8a934b6..2bf9584ce5 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -234,11 +234,6 @@ else { $cflags="$c_flags$cflags" if ($c_flags ne ""); } $ex_libs="$l_flags$ex_libs" if ($l_flags ne ""); -if ($ranlib ne "") - { - $ranlib="\$(SRC_D)$o$ranlib"; - } - if ($msdos) { $banner ="\t\@echo Make sure you have run 'perl Configure $platform' in the\n"; diff --git a/util/pl/unix.pl b/util/pl/unix.pl index aa2d7d1f37..146611ad99 100644 --- a/util/pl/unix.pl +++ b/util/pl/unix.pl @@ -38,7 +38,7 @@ $ex_libs=""; # static library stuff $mklib='ar r'; $mlflags=''; -$ranlib='util/ranlib.sh'; +$ranlib=&which("ranlib") or $ranlib="true"; $plib='lib'; $libp=".a"; $shlibp=".a"; @@ -80,4 +80,17 @@ sub do_link_rule return($ret); } +sub which + { + my ($name)=@_; + my $path; + foreach $path (split /:/, $ENV{PATH}) + { + if (-x "$path/$name") + { + return "$path/$name"; + } + } + } + 1; diff --git a/util/ranlib.sh b/util/ranlib.sh deleted file mode 100755 index 543f712c6b..0000000000 --- a/util/ranlib.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -cwd=`pwd` -cd /tmp - -if [ -s /bin/ranlib ] ; then - RL=/bin/ranlib -else if [ -s /usr/bin/ranlib ] ; then - RL=/usr/bin/ranlib -fi -fi - -if [ "x$RL" != "x" ] -then - case "$1" in - /*) - $RL "$1" - ;; - *) - $RL "$cwd/$1" - ;; - esac -fi diff --git a/util/sep_lib.sh b/util/sep_lib.sh index 2348db874e..34c2c9f8ba 100755 --- a/util/sep_lib.sh +++ b/util/sep_lib.sh @@ -21,9 +21,6 @@ do /bin/rm -f *.old /bin/mv Makefile.uni Makefile - cp $cwd/util/ranlib.sh . - chmod +x ranlib.sh - if [ -d asm ]; then mkdir asm/perlasm cp $cwd/crypto/perlasm/*.pl asm/perlasm -- 2.25.1