Scripts for testing ECC ciphersuites.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index bcdbc285ecd535202c08074051c1c9c9cba5c087..1db864b27ca4c5602a7b260001af5bea413cc4df 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -167,7 +167,7 @@ SHLIBDIRS= crypto ssl
 SDIRS=  \
        md2 md4 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
-       bn ec rsa dsa ecdsa dh dso engine aes \
+       bn ec rsa dsa ecdsa dh ecdh dso engine aes \
        buffer bio stack lhash rand err objects \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
 
@@ -733,7 +733,8 @@ install: all install_docs
                done; \
                (       here="`pwd`"; \
                        cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-                       $(MAKE) -f $$here/Makefile link-shared ); \
+                       set $(MAKE); \
+                       $$1 -f $$here/Makefile link-shared ); \
        fi
 
 install_docs:
@@ -742,7 +743,7 @@ install_docs:
                $(INSTALL_PREFIX)$(MANDIR)/man3 \
                $(INSTALL_PREFIX)$(MANDIR)/man5 \
                $(INSTALL_PREFIX)$(MANDIR)/man7
-       @pod2man=`cd ../../util; ./pod2mantest ignore`; \
+       @pod2man=`cd util; ./pod2mantest ignore`; \
        for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
@@ -753,7 +754,7 @@ install_docs:
                        --release=$(VERSION) `basename $$i`") \
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
        done; \
-       @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+       for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
                echo "installing man$$sec/`basename $$i .pod`.$$sec"; \