[pkg-opensc-commit] [libp11] 31/51: build: fix symlink installation

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit dbab2aaea671bf60fc49c946479707d3d93cc772
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Sat Oct 29 11:39:29 2016 +0300

    build: fix symlink installation
    
    this fixes incorrect fix b313f00cc of symlink installation
    
    instruct automake that enginesdir is exec to be added to
    install-exec-hook dependency.
    
    Signed-off-by: Alon Bar-Lev <alon.barlev at gmail.com>
    Thanks-to: Eric Dorland <eric at debian.org>
---
 configure.ac    | 16 ++++++++--------
 src/Makefile.am |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 820c0c6..0aa216f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,21 +123,21 @@ AC_ARG_WITH(
 AC_ARG_WITH(
 	[enginesdir],
 	[AS_HELP_STRING([--with-enginesdir], [OpenSSL engines directory])],
-	[enginesdir="${withval}"],
+	[enginesexecdir="${withval}"],
 	[
-		enginesdir="`$PKG_CONFIG --variable=enginesdir --silence-errors libcrypto`"
-		if test "${enginesdir}" = ""; then
+		enginesexecdir="`$PKG_CONFIG --variable=enginesdir --silence-errors libcrypto`"
+		if test "${enginesexecdir}" = ""; then
 		    libcryptodir="`$PKG_CONFIG --variable=libdir --silence-errors libcrypto || \
 			$PKG_CONFIG --variable=libdir openssl`"
 		    if test -d "$libcryptodir/$debian_ssl_prefix/engines"; then
 			# Debian-based OpenSSL package (for example Ubuntu)
-			enginesdir="$libcryptodir/$debian_ssl_prefix/engines"
+			enginesexecdir="$libcryptodir/$debian_ssl_prefix/engines"
 		    else # Default OpenSSL engines directory
-			enginesdir="$libcryptodir/engines"
+			enginesexecdir="$libcryptodir/engines"
 		    fi
 		    if test "${prefix}" != "NONE" -o "${exec_prefix}" != "NONE"; then
 			# Override the autodetected value with the default
-			enginesdir="${libdir}"
+			enginesexecdir="\$(libdir)"
 		    fi
 		fi
 	]
@@ -212,7 +212,7 @@ pkgconfigdir="\$(libdir)/pkgconfig"
 
 AC_SUBST([pkgconfigdir])
 AC_SUBST([apidocdir])
-AC_SUBST([enginesdir])
+AC_SUBST([enginesexecdir])
 AC_SUBST([LIBP11_VERSION_MAJOR])
 AC_SUBST([LIBP11_VERSION_MINOR])
 AC_SUBST([LIBP11_VERSION_FIX])
@@ -279,7 +279,7 @@ libp11 has been configured with the following options:
 
 Version:                 ${PACKAGE_VERSION}
 libp11 directory:        $(eval eval eval echo "${libdir}")
-Engine directory:        ${enginesdir}
+Engine directory:        ${enginesexecdir}
 Default PKCS11 module:   ${pkcs11_module}
 API doc support:         ${enable_api_doc}
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2aa5195..4e24da6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = Makefile.mak libp11.rc.in pkcs11.rc.in
 noinst_HEADERS= libp11-int.h pkcs11.h atfork.h
 include_HEADERS= libp11.h
 lib_LTLIBRARIES = libp11.la
-engines_LTLIBRARIES = pkcs11.la
+enginesexec_LTLIBRARIES = pkcs11.la
 pkgconfig_DATA = libp11.pc
 
 SHARED_EXT=@SHARED_EXT@
@@ -49,8 +49,7 @@ check-local: $(LTLIBRARIES)
 	cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
 
 install-exec-hook:
-	cp -pR -f .libs/pkcs11$(SHARED_EXT) $(DESTDIR)$(enginesdir)/pkcs11$(SHARED_EXT) \
-	&&  cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
+	cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
 
 if WIN32
 # def file required for MS users to build library

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git