Don't confuse mk1mf.pl by combining multiple options into one.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 8c36768a779c6476d8e1d7d29d4b0c4e8a83979d..d53dbe6076a770e3ae17914ed455ebb5e186f79a 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -6,6 +6,7 @@ VERSION=
 MAJOR=
 MINOR=
 PLATFORM=dist
+OPTIONS=
 # INSTALL_PREFIX is for package builders so that they can configure
 # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
 # Normally it is left empty.
@@ -161,7 +162,7 @@ SHELL=/bin/sh
 
 TOP=    .
 ONEDIRS=out tmp
-EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep
+EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
 WDIRS=  windows
 LIBS=   libcrypto.a libssl.a 
 
@@ -170,7 +171,7 @@ BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
 TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar
-EXHEADER=       e_os.h
+EXHEADER=       e_os.h e_os2.h
 HEADER=         e_os.h
 
 all: Makefile.ssl
@@ -242,7 +243,7 @@ files:
 
 links:
        @$(TOP)/util/point.sh Makefile.ssl Makefile
-       @-mkdir -p include/openssl 2>/dev/null
+       @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
        @for i in $(DIRS); do \
        (cd $$i && echo "making links in $$i..." && \
@@ -270,7 +271,7 @@ tests: rehash
 depend:
        @for i in $(DIRS) ;\
        do \
-       (cd $$i && echo "making dependancies $$i..." && \
+       (cd $$i && echo "making dependencies $$i..." && \
        $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \
        done;
 
@@ -291,9 +292,21 @@ tags:
 errors:
        perl util/mkerr.pl -recurse -write
 
+util/libeay.num::
+       perl util/mkdef.pl crypto update
+
+util/ssleay.num::
+       perl util/mkdef.pl ssl update
+
+TABLE: Configure
+       (echo 'Output of `Configure TABLE'"':"; \
+       perl Configure TABLE) > TABLE
+
+update: depend errors util/libeay.num util/ssleay.num TABLE
+
 tar:
-       @gtar --no-recursion -cvf - \
-               `find * -depth -print | grep -v CVS | grep -v .cvsignore | grep -v STATUS | sort` |\
+       @tar --norecurse -cvf - \
+               `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\
        tardy --user_number=0  --user_name=openssl \
              --group_number=0 --group_name=openssl \
              --prefix=openssl-$(VERSION) - |\
@@ -307,16 +320,21 @@ dist:
        @$(MAKE) tar
 
 dist_pem_h:
-       (cd crypto/pem; $(MAKE) SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
+       (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
 
 install: all
-       @-mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/bin 2>/dev/null
-       @-mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/lib 2>/dev/null
-       @-mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl 2>/dev/null
-       @-mkdir -p $(INSTALL_PREFIX)$(OPENSSLDIR)/misc 2>/dev/null
-       @-mkdir -p $(INSTALL_PREFIX)$(OPENSSLDIR)/certs 2>/dev/null
-       @-mkdir -p $(INSTALL_PREFIX)$(OPENSSLDIR)/private 2>/dev/null
-       @-mkdir -p $(INSTALL_PREFIX)$(OPENSSLDIR)/lib 2>/dev/null
+       @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/private \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/lib
+       @for i in $(EXHEADER) ;\
+       do \
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       done;
        @for i in $(DIRS) ;\
        do \
        (cd $$i; echo "installing $$i..."; \