ANSIfy, fix typo in error message, and remove redundant statement from

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 3fe81cc56b89f2299096d0899293ada8a54579d2..4397ef3343d13e8159822dc17363ecf85620afb2 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -5,8 +5,6 @@
 VERSION = 0.9.2b
 PLATFORM=dist
 
-# NOCONST - Define for C compilers that don't like the const key word.
-# NOPROTO - Define in if your compiler does not support prototypes.
 # RSAref  - Define if we are to link with RSAref.
 # NO_IDEA - Define to build without the IDEA algorithm
 # NO_RC4  - Define to build without the RC4 algorithm
@@ -21,7 +19,7 @@ PLATFORM=dist
 #           number generator is initalised.
 # SSL_ALLOW_ADH - define if you want the server to be able to use the
 #           SSLv3 anon-DH ciphers.
-# SSL_ALLOW_ENULL - define if you want the server to be able to use the
+# SSL_FORBID_ENULL - define if you want the server to be not able to use the
 #           NULL encryption ciphers.
 #
 # LOCK_DEBUG - turns on lots of lock debug output :-)
@@ -207,7 +205,7 @@ makefile.one: files
        $(PERL) util/mk1mf.pl >makefile.one; \
        sh util/do_ms.sh
 
-files:  MINFO
+files:
        $(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
        @for i in $(DIRS) ;\
        do \
@@ -217,7 +215,8 @@ files:  MINFO
 
 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; \
@@ -264,11 +263,7 @@ tags:
        done;
 
 errors:
-       @for i in $(DIRS) ;\
-       do \
-       (cd $$i && echo "making errors in $$i..." && \
-       $(MAKE) SDIRS='${SDIRS}' errors ) || exit 1; \
-       done;
+       perl util/mkerr.pl -static -recurse
 
 tar:
        @gtar --no-recursion -cvf - \
@@ -292,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) ;\