X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Makefile.org;h=7c000f25671d452b8926eb7a3b357474e89fdd43;hp=ecc4bf548ab7a264f456900135eefb1639979ff5;hb=71308064ccc8eaddf09e981b6d7d9d0f9f013956;hpb=83ec54b40db08669377b6e5eaf2581d3aa91c57f

diff --git a/Makefile.org b/Makefile.org
index ecc4bf548a..7c000f2567 100644
--- 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.
@@ -157,10 +133,9 @@ SDIRS=  \
 	des rc2 rc4 rc5 idea bf cast \
 	bn rsa dsa dh \
 	buffer bio stack lhash rand err objects \
-	evp asn1 pem x509 x509v3 conf txt_db pkcs7 comp
+	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 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 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:
@@ -290,7 +266,7 @@ errors:
 
 tar:
 	@gtar --no-recursion -cvf - \
-		`find * -depth -print | grep -v CVS | grep -v .cvsignore | grep -v STATUS sort` |\
+		`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) - |\
@@ -299,11 +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
-	@$(MAKE) makefile.one
 	@$(MAKE) tar
 
 dist_pem_h: