Commit ddeee82c authored by Bodo Möller's avatar Bodo Möller
Browse files

Install various scripts to $(OPENSSLDIR)/misc instead of $(INSTALLTOP)/bin. 

Submitted by:
Reviewed by:
PR:
parent bcaa8834

CHANGES

+6 −1
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ 


 Changes between 0.9.2b and 0.9.3



  *) Install various scripts to $(OPENSSLDIR)/misc, not to

     $(INSTALLTOP)/bin -- they shouldn't clutter directories

     such as /usr/local/bin.

     [Bodo Moeller]



  *) "make linux-shared" to build shared libraries.

     [Niels Poppe <niels@netbox.org>]

Makefile.org

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ install: all 
	@-mkdir -p $(INSTALLTOP)/bin 2>/dev/null

	@-mkdir -p $(INSTALLTOP)/lib 2>/dev/null

	@-mkdir -p $(INSTALLTOP)/include/openssl 2>/dev/null

	@-mkdir -p $(OPENSSLDIR)/misc 2>/dev/null

	@-mkdir -p $(OPENSSLDIR)/certs 2>/dev/null

	@-mkdir -p $(OPENSSLDIR)/private 2>/dev/null

	@-mkdir -p $(OPENSSLDIR)/lib 2>/dev/null

apps/Makefile.ssl

+7 −1
Original line number Diff line number Diff line
@@ -88,12 +88,18 @@ files: 
	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO



install:

	@for i in $(EXE) $(SCRIPTS); \

	@for i in $(EXE); \

	do  \

	(echo installing $$i; \

	 cp $$i $(INSTALLTOP)/bin/$$i; \

	 chmod 755 $(INSTALLTOP)/bin/$$i ); \

	 done; \

	@for i in $(SCRIPTS); \

	do  \

	(echo installing $$i; \

	 cp $$i $(OPENSSLDIR)/misc/$$i; \

	 chmod 755 $(INSTALLTOP)/misc/$$i ); \

	 done; \

	cp openssl.cnf $(OPENSSLDIR)/lib; \

	chmod 644 $(OPENSSLDIR)/lib/openssl.cnf

tools/Makefile.ssl

+6 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ CFLAGS= $(INCLUDES) $(CFLAG) 


GENERAL=Makefile.ssl

TEST=

APPS= c_hash c_info c_issuer c_name c_rehash

APPS= c_rehash

MISC_APPS= c_hash c_info c_issuer c_name



all:
@@ -25,6 +26,10 @@ install: 
	do  \

	(cp $$i $(INSTALLTOP)/bin/$$i; \

	chmod 755 $(INSTALLTOP)/bin/$$i ); \

	@for i in $(MISC_APPS) ; \

	do  \

	(cp $$i $(OPENSSLTOP)/misc/$$i; \

	chmod 755 $(OPENSSLTOP)/misc/$$i ); \

	done;



files: