This avoids recursing twice simply to install three files. Also use the
standard pkginclude installation path.
---
Makefile.am | 8 +++++++-
configure.in | 2 --
usr/include/Makefile.am | 1 -
usr/include/pkcs11/Makefile.am | 5 -----
4 files changed, 7 insertions(+), 9 deletions(-)
delete mode 100644 usr/include/Makefile.am
delete mode 100644 usr/include/pkcs11/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f3770c7..f548f29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ if ENABLE_DAEMON
MISCDIR = misc
DAEMONDIRS = \
- usr/include \
usr/sbin/pkcsslotd \
usr/sbin/pkcs11_startup \
usr/sbin/pkcs_slot \
@@ -64,3 +63,10 @@ man7_MANS = man/opencryptoki.7
man8_MANS = man/pkcsslotd.8
dist_doc_DATA = AUTHORS ChangeLog LICENSE COPYRIGHTS FAQ README TODO
+
+if ENABLE_LIBRARY
+pkginclude_HEADERS = \
+ usr/include/pkcs11/apiclient.h \
+ usr/include/pkcs11/pkcs11types.h \
+ usr/include/pkcs11/pkcs11.h
+endif
diff --git a/configure.in b/configure.in
index 3b6f31a..1049c82 100644
--- a/configure.in
+++ b/configure.in
@@ -616,8 +616,6 @@ AC_SUBST([stdlldir], ['$(libdir)/opencryptoki/stdll'])
AC_PROG_CC
AC_CONFIG_FILES([Makefile
- usr/include/Makefile \
- usr/include/pkcs11/Makefile \
usr/lib/pkcs11/api/Makefile \
usr/lib/pkcs11/ica_stdll/Makefile \
usr/lib/pkcs11/ica_s390_stdll/Makefile \
diff --git a/usr/include/Makefile.am b/usr/include/Makefile.am
deleted file mode 100644
index 75e0268..0000000
--- a/usr/include/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = pkcs11
diff --git a/usr/include/pkcs11/Makefile.am b/usr/include/pkcs11/Makefile.am
deleted file mode 100644
index 0af83c2..0000000
--- a/usr/include/pkcs11/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-opencryptoki_headers = apiclient.h pkcs11types.h pkcs11.h
-
-opencryptokiincludedir=$(includedir)/opencryptoki
-
-opencryptokiinclude_HEADERS = $(opencryptoki_headers)
--
1.7.5.rc1
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
