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

Submitted by:
Reviewed by:
PR:

CHANGES

diff --git a/CHANGES b/CHANGES
index 90992da..788a1df 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,8 +5,13 @@
 
  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>]
+     [Niels Poppe <niels@netbox.org>]
 
   *) New Configure option no-<cipher> (rsa, idea, rc5, ...).
      [Ulf Möller]

Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 97bf3cf..4ebab68 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -310,6 +310,7 @@
 	@-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

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 5971ada..8a128a7 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -88,12 +88,18 @@
 	$(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

diff --git a/tools/Makefile.ssl b/tools/Makefile.ssl
index f12f85a..959d752 100644
--- a/tools/Makefile.ssl
+++ b/tools/Makefile.ssl
@@ -16,7 +16,8 @@
 
 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 @@
 	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: