diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-04-30 21:39:39 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-04-30 21:39:39 +0000 |
| commit | 4c3a2d64e43901ae954d4e6382ac7995330c6dc0 (patch) | |
| tree | c817053e9ec711aac110aa92f09fa8fc212aa6fb /Makefile.org | |
| parent | 98a2fd32a098949a6727ef59f51225f82ba5d95c (diff) | |
| download | openssl-new-4c3a2d64e43901ae954d4e6382ac7995330c6dc0.tar.gz | |
Fold rules in test/Makefiles [from stable].
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.org b/Makefile.org index 528ca3b52d..a6f59dd9e5 100644 --- a/Makefile.org +++ b/Makefile.org @@ -118,8 +118,6 @@ SDIRS= \ TESTS = alltests MAKEFILE= Makefile -NEWMAKE= make -MAKE= $(NEWMAKE) MANDIR=$(OPENSSLDIR)/man MAN1=1 @@ -229,7 +227,7 @@ clean-shared: link-shared: @ set -e; for i in ${SHLIBDIRS}; do \ - $(NEWMAKE) -f $(HERE)/Makefile.shared \ + $(MAKE) -f $(HERE)/Makefile.shared \ LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \ LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \ symlink.$(SHLIB_TARGET); \ @@ -243,7 +241,7 @@ do_$(SHLIB_TARGET): if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \ libs="$(LIBKRB5) $$libs"; \ fi; \ - $(NEWMAKE) -f Makefile.shared \ + $(MAKE) -f Makefile.shared \ $(BUILDENV) \ LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \ LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \ @@ -483,7 +481,7 @@ install_sw: done; \ ( here="`pwd`"; \ cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ - $(NEWMAKE) -f $$here/Makefile HERE="$$here" link-shared ); \ + $(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \ if [ "$(INSTALLTOP)" != "/usr" ]; then \ echo 'OpenSSL shared libraries have been installed in:'; \ echo ' $(INSTALLTOP)'; \ |