diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-04-01 12:34:33 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-04-01 12:34:33 +0000 |
| commit | 99aab1619f02b184f140150c72276bf55716cc42 (patch) | |
| tree | 4a242345579d7fddff7371432170b6081a3cfd8f | |
| parent | 6b01fa64904749537db5dcf948a9a094d63cfc16 (diff) | |
New Makefile variables $(RANLIB) and $(PERL).
61 files changed, 269 insertions, 300 deletions
@@ -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] @@ -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 (<IN>) 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. @@ -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) |