trust: Move the extract-trust external placeholder command into trust/

diff --git a/.gitignore b/.gitignore
index 2fe4e8bd9c4668d6fcade34b459dd3c0ea3e3f2d..e5b5c8e3789d7aeb4c9b5f5b1b8c412804a8eedd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,7 @@ x86_64-w64-mingw32
 /p11-kit/tests/uri-test
 
 /tools/p11-kit
-/tools/p11-kit-extract-trust
+
+/trust/p11-kit-extract-trust
 
 /p11-kit-?.?

diff --git a/configure.ac b/configure.ac
index cf886a97b781f0993519606eaf8640ef13132d7f..17995e74f60d15e55ae51eff78092ac7b1c91ebc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -429,9 +429,9 @@ AC_CONFIG_FILES([Makefile
        p11-kit/p11-kit-1.pc
        p11-kit/pkcs11.conf.example
        tools/Makefile
-       tools/p11-kit-extract-trust
        tools/tests/Makefile
        trust/Makefile
+       trust/p11-kit-extract-trust
        trust/tests/Makefile
 ])
 AC_OUTPUT

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6155b6d2d0dc68f1ffc75dddc7491ad6f2af862e..5e48149aab44d987e04d79f2b0975c837011a932 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -50,8 +50,4 @@ p11_kit_SOURCES += \
        save.c save.h \
        $(NULL)
 
-externaldir = $(privatedir)
-external_SCRIPTS = \
-       p11-kit-extract-trust
-
 endif # WITH_ASN1

diff --git a/trust/Makefile.am b/trust/Makefile.am
index 264ea7cad734c574963e0df7c03e4681eeb9585d..875c8c4ea6b2b957591dd3d3254856658a60add8 100644 (file)
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -56,5 +56,9 @@ libtrust_testable_la_LDFLAGS = \
 
 libtrust_testable_la_SOURCES = $(MODULE_SRCS)
 
+externaldir = $(privatedir)
+external_SCRIPTS = \
+       p11-kit-extract-trust
+
 EXTRA_DIST = \
        p11-kit-trust.module

diff --git a/tools/p11-kit-extract-trust.in b/trust/p11-kit-extract-trust.in
similarity index 100%
rename from tools/p11-kit-extract-trust.in
rename to trust/p11-kit-extract-trust.in