X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=Makefile.org;h=7531f5a2db0f62bdea52b6b59f84203845adaadb;hb=1e103eafb380a6be490955d15e2df577989cef5b;hp=4397ef3343d13e8159822dc17363ecf85620afb2;hpb=6d31193858f176c276fe5f27d36408977933c1d6;p=openssl.git

diff --git a/Makefile.org b/Makefile.org
index 4397ef3343..7531f5a2db 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -4,6 +4,10 @@
 
 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
 
 # RSAref  - Define if we are to link with RSAref.
 # NO_IDEA - Define to build without the IDEA algorithm
@@ -39,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
@@ -139,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
 
@@ -245,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:
@@ -263,7 +265,7 @@ tags:
 	done;
 
 errors:
-	perl util/mkerr.pl -static -recurse
+	perl util/mkerr.pl -recurse -write
 
 tar:
 	@gtar --no-recursion -cvf - \
@@ -286,14 +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)/include/openssl 2>/dev/null
-	@-mkdir -p $(INSTALLTOP)/certs 2>/dev/null
-	@-mkdir -p $(INSTALLTOP)/private 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 \