diff options
| author | bodo <bodo> | 1999-04-28 22:06:15 +0000 |
|---|---|---|
| committer | bodo <bodo> | 1999-04-28 22:06:15 +0000 |
| commit | a992de11b8f33602374775128faa49d7b209ea07 (patch) | |
| tree | 4ee328be7e9bfb2a5956c1fcacdeb82d503abca2 | |
| parent | 0ebfdeaf4161e07ea0643b95bddf2a1c144f5cac (diff) | |
| download | openssl-a992de11b8f33602374775128faa49d7b209ea07.tar.gz | |
Install various scripts to $(OPENSSLDIR)/misc instead of $(INSTALLTOP)/bin.
Submitted by:
Reviewed by:
PR:
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | Makefile.org | 1 | ||||
| -rw-r--r-- | apps/Makefile.ssl | 8 | ||||
| -rw-r--r-- | tools/Makefile.ssl | 7 |
4 files changed, 20 insertions, 3 deletions
@@ -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 97bf3cf3f..4ebab6874 100644 --- 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 5971ada4c..8a128a7b8 100644 --- 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 f12f85adb..959d752c9 100644 --- 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: |