In the unified scheme, there is no $(TOP), use $(SRCDIR) instead

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index 0a462a173fc856f9a1c0282946b540749c9b76ca..a6b94c41426a34dfb0596d42118fdec7b977cc2a 100644 (file)
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -71,9 +71,9 @@ BEGINRAW[Makefile]
 # GNU assembler fails to compile PA-RISC2 modules, insist on calling
 # vendor assembler...
 {- $builddir -}/pa-risc2W.o: {- $sourcedir -}/asm/pa-risc2W.s
-       CC="$(CC)" $(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2W.o {- $sourcedir -}/asm/pa-risc2W.s
+       CC="$(CC)" $(PERL) $(SRCDIR)/util/fipsas.pl $(SRCDIR) $< /usr/ccs/bin/as -o pa-risc2W.o {- $sourcedir -}/asm/pa-risc2W.s
 {- $builddir -}/pa-risc2.o: {- $sourcedir -}/asm/pa-risc2.s
-       CC="$(CC)" $(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2.o {- $sourcedir -}/asm/pa-risc2.s
+       CC="$(CC)" $(PERL) $(SRCDIR)/util/fipsas.pl $(SRCDIR) $< /usr/ccs/bin/as -o pa-risc2.o {- $sourcedir -}/asm/pa-risc2.s
 
 {- $builddir -}/parisc-mont.s: {- $sourcedir -}/asm/parisc-mont.pl
        CC="$(CC)" $(PERL) {- $sourcedir -}/asm/parisc-mont.pl $(PERLASM_SCHEME) $@

diff --git a/crypto/build.info b/crypto/build.info
index 736079c2968d914ee7ce451cebb1fdb7591052b2..507e998fc5c5241713c3278b1d2cbffc8a9451e4 100644 (file)
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -22,13 +22,13 @@ crypto/buildinf.h : Makefile
 ##### APPLINK, UPLINK and CPUID assembler implementations
 
 {- $builddir -}/applink.o:     $(SRCDIR)/ms/applink.c
-       $(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/applink.c
+       $(CC) $(CFLAGS) -c -o $@ $(SRCDIR)/ms/applink.c
 
 {- $builddir -}/uplink.o:      $(SRCDIR)/ms/uplink.c {- $builddir -}/applink.o
-       $(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/uplink.c
+       $(CC) $(CFLAGS) -c -o $@ $(SRCDIR)/ms/uplink.c
 
 {- $builddir -}/uplink-x86.s:  $(SRCDIR)/ms/uplink-x86.pl
-       CC="$(CC)" $(PERL) $(TOP)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@
+       CC="$(CC)" $(PERL) $(SRCDIR)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@
 
 {- $builddir -}/x86cpuid.s:    {- $sourcedir -}/x86cpuid.pl {- $sourcedir -}/perlasm/x86asm.pl
        CC="$(CC)" $(PERL) {- $sourcedir -}/x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

diff --git a/crypto/rc4/build.info b/crypto/rc4/build.info
index ea83e368a80b7769b3bf3b2136134c2f998b1b6e..8d63bab70c34059ce9bdc1537e108c98b513aa53 100644 (file)
--- a/crypto/rc4/build.info
+++ b/crypto/rc4/build.info
@@ -18,7 +18,7 @@ BEGINRAW[Makefile]
        CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-parisc.pl $(PERLASM_SCHEME) $@
 
 {- $builddir -}/rc4-ia64.s: rc4-ia64.S
-       @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
+       @case `awk '/^#define RC4_INT/{print$$NF}' $(SRCDIR)/include/openssl/opensslconf.h` in \
        int)    set -x; $(CC) $(CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \
        char)   set -x; $(CC) $(CFLAGS) -DSZ=1 -E rc4-ia64.S > $@ ;; \
        *)      exit 1 ;; \