Typo

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index fbf293c76286006e69bc788abdf7fb44efc444e8..d8af86e92a224d0120d37b89e4a7c13b0ec23302 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -1,34 +1,10 @@
-#
-# Makefile for all the SSL related library routines and utilities
-VERSION = 0.9.2
-PLATFORM=FreeBSD
-#
-# make install will install:
-#   libraries into $INSTALLTOP/lib
-#   headers   into $INSTALLTOP/include
-#   utilities into $INSTALLTOP/bin
-#
-# By default INSTALLTOP is set to /usr/local/ssl
-# If you want things install elsewere, consider running
-# perl util/ssldir.pl /new/path
-#
-# Interesting Mailing Lists:
-#     ssl-bugs@mincom.oz.au
-#     ssl-users@mincom.oz.au
-#
-# To join the Mailing Lists:
-#     ssl-bugs-request@mincom.oz.au
-#     ssl-users-request@mincom.oz.au
-#
-# If you must get hold of people directly (we much prefer the above
-# lists to be used if the question is of general interest!):
-#       Eric Young <eay@cryptsoft.com>
-#       Tim Hudson <tjh@cryptsoft.com>
-#       or both    <ssleay@cryptsoft.com>
-#
-# The primary distribution of SSLeay is from
-# ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL
-#
+##
+## Makefile for OpenSSL
+##
+
+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.
@@ -159,8 +135,7 @@ SDIRS=  \
        buffer bio stack lhash rand err objects \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 comp
 
-# If you change the INSTALLTOP, make sure to also change the values
-# in crypto/location.h
+# Do not edit this manually. Use util/ssldir.pl do change this!
 INSTALLTOP=/usr/local/ssl
 
 MAKEFILE= Makefile.ssl
@@ -199,8 +174,9 @@ sub_all:
        done;
 
 Makefile.ssl: Makefile.org
-       @echo "Makefile.ssl is older than Makefile.org. Rerun Configure"
-       @echo "and do a make links and a make errors."
+       @echo "Makefile.ssl is older than Makefile.org."
+       @echo "Reconfigure the source tree (via 'perl Configure' or 'sh config')"
+       @echo "and update the error lists (via 'make errors'), please."
        @false
 
 libclean:
@@ -238,7 +214,7 @@ links:
        @$(TOP)/util/mklink.sh include $(EXHEADER)
        @for i in $(DIRS); do \
        (cd $$i && echo "making links in $$i..." && \
-       $(MAKE) SDIRS='${SDIRS}' links ) || exit 1; \
+       $(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; \
        done;
        @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 
@@ -290,8 +266,8 @@ errors:
 
 tar:
        @gtar --no-recursion -cvf - \
-               `find * -depth -print | grep -v CVS | grep -v .cvsignore | sort` |\
-       tardy --user_number=0  --user_name=rse      \
+               `find * -depth -print | grep -v CVS | grep -v .cvsignore | grep -v STATUS | sort` |\
+       tardy --user_number=0  --user_name=openssl \
              --group_number=0 --group_name=openssl \
              --prefix=openssl-$(VERSION) - |\
        gzip --best >../$(TARFILE).gz; \
@@ -299,12 +275,8 @@ tar:
 
 dist:   
        perl Configure dist
-       perl util/up_ver.pl ${VERSION}
        @$(MAKE) dist_pem_h
        @$(MAKE) SDIRS='${SDIRS}' clean
-       @$(MAKE) SDIRS='${SDIRS}' dclean
-       @(cd apps; sh ./rmlinks)
-       @$(MAKE) makefile.one
        @$(MAKE) tar
 
 dist_pem_h: