Put the external tools in $libdir/p11-kit

These are possibly architecture specific binaries, so they should be
in $libdir/p11-kit and not in $datadir/p11-kit

diff --git a/configure.ac b/configure.ac
index 8ce8e3fa263db8e290d0c40b6b32e9e4da927b3e..b3c76108f141f0fe182687954084eabaaa867b87 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -402,6 +402,9 @@ eval SHLEXT=$shrext_cmds
 AC_DEFINE_UNQUOTED(SHLEXT, ["$SHLEXT"], [File extension for shared libraries])
 AC_SUBST(SHLEXT)
 
+privatedir='${libdir}/p11-kit'
+AC_SUBST(privatedir)
+
 AC_CONFIG_FILES([Makefile
        build/Makefile
        build/certs/Makefile

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 92c2644799cf7ca227be3b694af05078344d1dc9..6155b6d2d0dc68f1ffc75dddc7491ad6f2af862e 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/p11-kit \
        -DSRCDIR=\"$(srcdir)\" \
-       -DPKGDATADIR=\"$(pkgdatadir)\" \
+       -DPRIVATEDIR=\"$(privatedir)\" \
        -DP11_KIT_FUTURE_UNSTABLE_API \
        $(NULL)
 
@@ -50,7 +50,7 @@ p11_kit_SOURCES += \
        save.c save.h \
        $(NULL)
 
-externaldir = $(pkgdatadir)
+externaldir = $(privatedir)
 external_SCRIPTS = \
        p11-kit-extract-trust
 

diff --git a/tools/tool.c b/tools/tool.c
index 961890dbf125da191da67d8899fd47d080f84db9..a2dbcbddf083c282f11b7e7296d8735228c3e32c 100644 (file)
--- a/tools/tool.c
+++ b/tools/tool.c
@@ -202,7 +202,7 @@ exec_external (const char *command,
 
        /* Add our libexec directory to the path */
        path = getenv ("PATH");
-       if (!asprintf (&env, "PATH=%s%s%s", path ? path : "", path ? P11_PATH_SEP : "", PKGDATADIR))
+       if (!asprintf (&env, "PATH=%s%s%s", path ? path : "", path ? P11_PATH_SEP : "", PRIVATEDIR))
                return_if_reached ();
        putenv (env);