Typo.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 5ec16452cc1587c6ec83a3e0c8c0b8c8048363c6..7531f5a2db0f62bdea52b6b59f84203845adaadb 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -4,9 +4,11 @@
 
 VERSION = 0.9.2b
 PLATFORM=dist
+INSTALLTOP=/usr/local/ssl
+
+# Do not edit this manually. Use Configure --openssldir=DIR do change this!
+OPENSSLDIR=/usr/local/ssl
 
-# 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
@@ -41,6 +43,7 @@ PLATFORM=dist
 CC= gcc
 #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
 CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
+DEPFLAG= 
 PEX_LIBS= -L. -L.. -L../.. -L../../..
 EX_LIBS= 
 AR=ar r
@@ -141,9 +144,6 @@ SDIRS=  \
        buffer bio stack lhash rand err objects \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
 
-# Do not edit this manually. Use util/ssldir.pl do change this!
-INSTALLTOP=/usr/local/ssl
-
 MAKEFILE= Makefile.ssl
 MAKE=     make -f Makefile.ssl
 
@@ -217,7 +217,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; \
@@ -246,7 +247,7 @@ depend:
        @for i in $(DIRS) ;\
        do \
        (cd $$i && echo "making dependancies $$i..." && \
-       $(MAKE) SDIRS='${SDIRS}' depend ) || exit 1; \
+       $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \
        done;
 
 lint:
@@ -264,11 +265,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 - \
@@ -291,13 +288,14 @@ dist_pem_h:
 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)/certs 2>/dev/null
-       @-mkdir -p $(INSTALLTOP)/private 2>/dev/null
+       @-mkdir -p $(INSTALLTOP)/include/openssl 2>/dev/null
+       @-mkdir -p $(OPENSSLDIR)/certs 2>/dev/null
+       @-mkdir -p $(OPENSSLDIR)/private 2>/dev/null
+       @-mkdir -p $(OPENSSLDIR)/lib 2>/dev/null
        @for i in $(DIRS) ;\
        do \
        (cd $$i; echo "installing $$i..."; \
-       $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' install ); \
+       $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' install ); \
        done
        @for i in $(LIBS) ;\
        do \