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

Submitted by:
Reviewed by:
PR:

diff --git a/CHANGES b/CHANGES
index 90992da73e2a4188bbf7d8b6517259165034991d..788a1df3dbe307d590a0d7b654389298907f9793 100644 (file)
--- 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]

diff --git a/Makefile.org b/Makefile.org
index 97bf3cf3fe5e5f4293ca35e63b268c9331eccccb..4ebab6874403211cf265b7f842b8d9618d305a77 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -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

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 5971ada4ccdd45ccb11045f96564e41c9f2a00be..8a128a7b80f46ab354a8e516ff5815f53f899f87 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -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
 

diff --git a/tools/Makefile.ssl b/tools/Makefile.ssl
index f12f85adb975c7eda20147359813bad299da58e6..959d752c9f341a94346883be055d8de66e4c48da 100644 (file)
--- a/tools/Makefile.ssl
+++ b/tools/Makefile.ssl
@@ -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: