X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fcomp%2FMakefile.ssl;h=511c955efa988ddf6f7119c807dd5304837abda2;hb=ec577822f95a8bca0023c5c77cef1a4916822d4a;hp=842443a6a45edc9ef7bdd84dc5f1e98fd2adb7ec;hpb=b4cadc6e1343c01b06613053a90ed2ee85e65090;p=openssl.git

diff --git a/crypto/comp/Makefile.ssl b/crypto/comp/Makefile.ssl
index 842443a6a4..511c955efa 100644
--- a/crypto/comp/Makefile.ssl
+++ b/crypto/comp/Makefile.ssl
@@ -42,23 +42,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:
@@ -73,7 +73,7 @@ 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:
@@ -88,17 +88,19 @@ comp.err:
 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
+	$(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.
 
 c_rle.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
 c_rle.o: ../../include/crypto.h ../../include/objects.h
-c_rle.o: ../../include/opensslv.h ../../include/stack.h comp.h
+c_rle.o: ../../include/opensslv.h ../../include/stack.h ../opensslconf.h comp.h
 c_zlib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
 c_zlib.o: ../../include/crypto.h ../../include/objects.h
-c_zlib.o: ../../include/opensslv.h ../../include/stack.h comp.h
+c_zlib.o: ../../include/opensslv.h ../../include/stack.h ../opensslconf.h
+c_zlib.o: comp.h
 comp_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
 comp_lib.o: ../../include/crypto.h ../../include/objects.h
-comp_lib.o: ../../include/opensslv.h ../../include/stack.h comp.h
+comp_lib.o: ../../include/opensslv.h ../../include/stack.h ../opensslconf.h
+comp_lib.o: comp.h