3 files changed, 9 insertions, 42 deletions

diff --git a/apps/ocspcheck/Makefile.am b/apps/ocspcheck/Makefile.am
index e3f7971..71a73ea 100644
--- a/apps/ocspcheck/Makefile.am
+++ b/apps/ocspcheck/Makefile.am
@@ -1,8 +1,11 @@
 include $(top_srcdir)/Makefile.am.common
 
+if !ENABLE_LIBTLS_ONLY
 bin_PROGRAMS = ocspcheck
-
 dist_man_MANS = ocspcheck.8
+else
+noinst_PROGRAMS = ocspcheck
+endif
 
 EXTRA_DIST = ocspcheck.8
 EXTRA_DIST += CMakeLists.txt
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt
index 752f3ec..b9cd222 100644
--- a/apps/openssl/CMakeLists.txt
+++ b/apps/openssl/CMakeLists.txt
@@ -83,13 +83,3 @@ if(ENABLE_LIBRESSL_INSTALL)
         install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR})
         install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 endif(ENABLE_LIBRESSL_INSTALL)
-
-if(NOT "${OPENSSLDIR}" STREQUAL "")
-        set(CONF_DIR "${OPENSSLDIR}")
-else()
-        set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
-endif()
-if(ENABLE_LIBRESSL_INSTALL)
-        install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR})
-        install(DIRECTORY DESTINATION ${CONF_DIR}/certs)
-endif(ENABLE_LIBRESSL_INSTALL)
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index 0bd8ca4..b98e08d 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -1,8 +1,11 @@
 include $(top_srcdir)/Makefile.am.common
 
+if !ENABLE_LIBTLS_ONLY
 bin_PROGRAMS = openssl
-
 dist_man_MANS = openssl.1
+else
+noinst_PROGRAMS = openssl
+endif
 
 openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la
 openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la
@@ -92,34 +95,5 @@ noinst_HEADERS += testdsa.h
 noinst_HEADERS += testrsa.h
 noinst_HEADERS += timeouts.h
 
-EXTRA_DIST = cert.pem
-EXTRA_DIST += openssl.cnf
-EXTRA_DIST += x509v3.cnf
-EXTRA_DIST += CMakeLists.txt
-
-install-exec-hook:
-        @if [ "@OPENSSLDIR@x" != "x" ]; then \
-                OPENSSLDIR="$(DESTDIR)@OPENSSLDIR@"; \
-        else \
-                OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \
-        fi; \
-        mkdir -p "$$OPENSSLDIR/certs"; \
-        for i in cert.pem openssl.cnf x509v3.cnf; do \
-                if [ ! -f "$$OPENSSLDIR/$i" ]; then \
-                        $(INSTALL) -m 644 "$(srcdir)/$$i" "$$OPENSSLDIR/$$i"; \
-                else \
-                        echo " $$OPENSSLDIR/$$i already exists, install will not overwrite"; \
-                fi \
-        done
+EXTRA_DIST = CMakeLists.txt
 
-uninstall-local:
-        @if [ "@OPENSSLDIR@x" != "x" ]; then \
-                OPENSSLDIR="$(DESTDIR)@OPENSSLDIR@"; \
-        else \
-                OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \
-        fi; \
-        for i in cert.pem openssl.cnf x509v3.cnf; do \
-                if cmp -s "$$OPENSSLDIR/$$i" "$(srcdir)/$$i"; then \
-                        rm -f "$$OPENSSLDIR/$$i"; \
-                fi \
-        done