X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=crypto%2Fconf%2FMakefile.ssl;h=44c0293da229ec90a3a75e03a5ffed39fd2bfa25;hb=c76b0f751f83762d470f3be0c9c3c108465a0ace;hp=dc396f00249ab5b8f23c4576654e67d22834f9fc;hpb=b4cadc6e1343c01b06613053a90ed2ee85e65090;p=openssl.git

diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index dc396f0024..44c0293da2 100644
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -15,7 +15,6 @@ AR=		ar r
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
-ERR=conf
 ERRC=conf_err
 GENERAL=Makefile
 TEST=
@@ -40,23 +39,23 @@ all:	lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
-	sh $(TOP)/util/ranlib.sh $(LIB)
+	$(RANLIB) $(LIB)
 	@touch lib
 
 files:
-	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
 	@$(TOP)/util/point.sh Makefile.ssl Makefile
-	@$(TOP)/util/mklink.sh ../../include $(EXHEADER)
+	@$(TOP)/util/mklink.sh ../../include/openssl $(EXHEADER)
 	@$(TOP)/util/mklink.sh ../../test $(TEST)
 	@$(TOP)/util/mklink.sh ../../apps $(APPS)
 
 install:
 	@for i in $(EXHEADER) ; \
 	do  \
-	(cp $$i $(INSTALLTOP)/include/$$i; \
-	chmod 644 $(INSTALLTOP)/include/$$i ); \
+	(cp $$i $(INSTALLTOP)/include/openssl/$$i; \
+	chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \
 	done;
 
 tags:
@@ -71,22 +70,18 @@ depend:
 	$(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
 
 dclean:
-	perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
 	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
-errors: $(ERRC).c
-
-$(ERRC).c: $(ERR).err
-	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
-	perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
-
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-conf.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-conf.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-conf.o: ../cryptlib.h ../crypto.h ../opensslv.h conf.h conf_lcl.h
-conf_err.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-conf_err.o: conf.h
+conf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+conf.o: ../../include/openssl/e_os.h ../../include/openssl/err.h
+conf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h
+conf.o: ../../include/openssl/stack.h ../cryptlib.h conf_lcl.h
+conf_err.o: ../../include/openssl/conf.h ../../include/openssl/err.h
+conf_err.o: ../../include/openssl/lhash.h ../../include/openssl/stack.h