diff options
| author | Stef Walter <stef@thewalter.net> | 2013-06-17 14:51:49 +0200 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2013-06-17 15:22:49 +0200 |
| commit | 93f197792150ae2e2e3ffafb903dfab6854915cb (patch) | |
| tree | 13a53debeaf369189cbc0d1728a055c07ee416f5 | |
| parent | 41d2a28b89af41799d01d5973d026712d9174f31 (diff) | |
| download | p11-kit-93f197792150ae2e2e3ffafb903dfab6854915cb.tar.gz | |
trust: Move the extract-trust external placeholder command into trust/
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 | ||||
| -rw-r--r-- | trust/Makefile.am | 4 | ||||
| -rwxr-xr-x | trust/p11-kit-extract-trust.in (renamed from tools/p11-kit-extract-trust.in) | 0 |
5 files changed, 7 insertions, 6 deletions
@@ -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 cf886a9..17995e7 100644 --- 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 6155b6d..5e48149 100644 --- 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 264ea7c..875c8c4 100644 --- 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 index c7214e9..c7214e9 100755 --- a/tools/p11-kit-extract-trust.in +++ b/trust/p11-kit-extract-trust.in |