diff options
| author | Stef Walter <stefw@gnome.org> | 2013-04-04 09:34:21 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-04-04 09:34:21 +0200 |
| commit | 3e5916530b995bda1a5deea7ecf9c185a402d463 (patch) | |
| tree | c07a9f80371e456d656bc7565ba9b04f3ba40af9 | |
| parent | 941ff24161e040fca7382e3f98b0c1b51da21dac (diff) | |
| download | p11-kit-3e5916530b995bda1a5deea7ecf9c185a402d463.tar.gz | |
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
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/tool.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8ce8e3f..b3c7610 100644 --- 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 92c2644..6155b6d 100644 --- 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 961890d..a2dbcbd 100644 --- 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); |