Change the command line options of mkerr.pl so -static is now default and

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 074899f3069b7333ea86ce9ee214a85e76386c71..0e9dfa35b5a4495515ff7b3fba8b2b23903551cd 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -215,7 +215,8 @@ files:
 
 links:
        @$(TOP)/util/point.sh Makefile.ssl Makefile
-       @$(TOP)/util/mklink.sh include $(EXHEADER)
+       @-mkdir -p include/openssl 2>/dev/null
+       @$(TOP)/util/mklink.sh include/openssl $(EXHEADER)
        @for i in $(DIRS); do \
        (cd $$i && echo "making links 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}' links ) || exit 1; \
@@ -262,11 +263,7 @@ tags:
        done;
 
 errors:
-       @for i in $(DIRS) ;\
-       do \
-       (cd $$i && echo "making errors in $$i..." && \
-       $(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' errors ) || exit 1; \
-       done;
+       perl util/mkerr.pl -recurse -write
 
 tar:
        @gtar --no-recursion -cvf - \
@@ -290,6 +287,7 @@ install: all
        @-mkdir -p $(INSTALLTOP)/bin 2>/dev/null
        @-mkdir -p $(INSTALLTOP)/lib 2>/dev/null
        @-mkdir -p $(INSTALLTOP)/include 2>/dev/null
+       @-mkdir -p $(INSTALLTOP)/include/openssl 2>/dev/null
        @-mkdir -p $(INSTALLTOP)/certs 2>/dev/null
        @-mkdir -p $(INSTALLTOP)/private 2>/dev/null
        @for i in $(DIRS) ;\