diff options
author | Brent Cook <bcook@openbsd.org> | 2015-07-12 22:15:04 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-07-12 22:15:04 -0500 |
commit | c136688ad7cae73e656d2b31e154d30c9fd0bdaa (patch) | |
tree | ee12275a5af717cb9ea4b5cc15f5d25a4afac9a3 | |
parent | e2903fcefcc412176bcf89b5e64c65c1ae9ab921 (diff) | |
parent | bda20bd13f8bf2063f915a3619db2292b38b6d88 (diff) | |
download | portable-c136688ad7cae73e656d2b31e154d30c9fd0bdaa.tar.gz portable-c136688ad7cae73e656d2b31e154d30c9fd0bdaa.tar.bz2 portable-c136688ad7cae73e656d2b31e154d30c9fd0bdaa.zip |
Land #107, improve default OPENSSLDIR install behavior
-rw-r--r-- | apps/Makefile.am | 22 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rwxr-xr-x | update.sh | 2 |
3 files changed, 27 insertions, 2 deletions
diff --git a/apps/Makefile.am b/apps/Makefile.am index 3604349..d756e10 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am | |||
@@ -84,4 +84,24 @@ noinst_HEADERS += s_apps.h | |||
84 | noinst_HEADERS += testdsa.h | 84 | noinst_HEADERS += testdsa.h |
85 | noinst_HEADERS += testrsa.h | 85 | noinst_HEADERS += testrsa.h |
86 | noinst_HEADERS += timeouts.h | 86 | noinst_HEADERS += timeouts.h |
87 | noinst_HEADERS += openssl.cnf | 87 | |
88 | EXTRA_DIST = cert.pem | ||
89 | EXTRA_DIST += openssl.cnf | ||
90 | EXTRA_DIST += x509v3.cnf | ||
91 | |||
92 | install-exec-hook: | ||
93 | @mkdir -p "$(DESTDIR)/$(OPENSSLDIR)" | ||
94 | @for i in cert.pem openssl.cnf x509v3.cnf; do \ | ||
95 | if [ ! -f "$(DESTDIR)/$(OPENSSLDIR)/$i" ]; then \ | ||
96 | $(INSTALL) -m 644 "$(srcdir)/$$i" "$(DESTDIR)/$(OPENSSLDIR)/$$i"; \ | ||
97 | else \ | ||
98 | echo " $(DESTDIR)/$(OPENSSLDIR)/$$i already exists, install will not overwrite"; \ | ||
99 | fi \ | ||
100 | done | ||
101 | |||
102 | uninstall-local: | ||
103 | @for i in cert.pem openssl.cnf x509v3.cnf; do \ | ||
104 | if cmp -s "$(DESTDIR)/$(OPENSSLDIR)/$$i" "$(srcdir)/$$i"; then \ | ||
105 | rm -f "$(DESTDIR)/$(OPENSSLDIR)/$$i"; \ | ||
106 | fi \ | ||
107 | done | ||
diff --git a/configure.ac b/configure.ac index 6cf41aa..4f6fb38 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -57,8 +57,11 @@ AC_CHECK_HEADERS([err.h]) | |||
57 | AC_ARG_WITH([openssldir], | 57 | AC_ARG_WITH([openssldir], |
58 | AS_HELP_STRING([--with-openssldir], | 58 | AS_HELP_STRING([--with-openssldir], |
59 | [Set the default openssl directory]), | 59 | [Set the default openssl directory]), |
60 | AC_DEFINE_UNQUOTED(OPENSSLDIR, "$withval") | 60 | OPENSSLDIR="$withval", |
61 | OPENSSLDIR="$sysconfdir/ssl" | ||
61 | ) | 62 | ) |
63 | AC_SUBST(OPENSSLDIR) | ||
64 | AC_DEFINE_UNQUOTED(OPENSSLDIR, "$OPENSSLDIR") | ||
62 | 65 | ||
63 | AC_ARG_ENABLE([extratests], | 66 | AC_ARG_ENABLE([extratests], |
64 | AS_HELP_STRING([--enable-extratests], [Enable extra tests that may be unreliable on some platforms])) | 67 | AS_HELP_STRING([--enable-extratests], [Enable extra tests that may be unreliable on some platforms])) |
@@ -203,7 +203,9 @@ sed -e "s/compat\///" crypto/Makefile.am.arc4random > \ | |||
203 | # copy openssl(1) source | 203 | # copy openssl(1) source |
204 | echo "copying openssl(1) source" | 204 | echo "copying openssl(1) source" |
205 | $CP $libc_src/stdlib/strtonum.c apps | 205 | $CP $libc_src/stdlib/strtonum.c apps |
206 | $CP $libcrypto_src/cert.pem apps | ||
206 | $CP $libcrypto_src/openssl.cnf apps | 207 | $CP $libcrypto_src/openssl.cnf apps |
208 | $CP $libcrypto_src/x509v3.cnf apps | ||
207 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do | 209 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do |
208 | if [ -e $openssl_app_src/$i ]; then | 210 | if [ -e $openssl_app_src/$i ]; then |
209 | $CP $openssl_app_src/$i apps | 211 | $CP $openssl_app_src/$i apps |