From fbf86e6728fc34d7a1cc7f0346b1c251946b4651 Mon Sep 17 00:00:00 2001 From: aet Date: Fri, 5 Apr 2002 10:25:14 +0000 Subject: [PATCH] Install headers to ${prefix}/include/opensc git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@456 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/Makefile.am | 6 ++++-- src/pam/Makefile.am | 4 ++-- src/pkcs11/Makefile.am | 4 ++-- src/pkcs15init/Makefile.am | 2 ++ src/scconf/Makefile.am | 2 ++ src/scldap/Makefile.am | 2 ++ src/scrandom/Makefile.am | 2 ++ src/sia/Makefile.am | 4 ++-- src/signer/Makefile.am | 4 ++-- 9 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am index 636665cd..a17252a1 100644 --- a/src/libopensc/Makefile.am +++ b/src/libopensc/Makefile.am @@ -1,5 +1,7 @@ ## Makefile.am -- Process this file with automake to produce Makefile.in +includedir = ${prefix}/include/opensc + MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = opensc-config.in @@ -31,5 +33,5 @@ libopensc_la_LDFLAGS = -version-info 0:6:0 libopensc_la_LIBADD = @LIBDL@ $(PCSC_LIB) $(SSL_LIB) $(LIBSCCONF) include_HEADERS = opensc.h opensc-pkcs15.h opensc-emv.h \ - cardctl.h -noinst_HEADERS = ctbcs.h sc-asn1.h sc-log.h sc-internal.h + cardctl.h sc-asn1.h sc-log.h +noinst_HEADERS = ctbcs.h sc-internal.h diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am index e8c8b0bb..7a2c6586 100644 --- a/src/pam/Makefile.am +++ b/src/pam/Makefile.am @@ -1,9 +1,9 @@ # Process this file with automake to create Makefile.in -MAINTAINERCLEANFILES = Makefile.in - libdir = ${prefix}/lib/security +MAINTAINERCLEANFILES = Makefile.in + INCLUDES = -I../scam LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ ../scam/libpamscam.la diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am index 6fbe3ce7..be55cc69 100644 --- a/src/pkcs11/Makefile.am +++ b/src/pkcs11/Makefile.am @@ -1,11 +1,11 @@ # Process this file with automake to create Makefile.in +libdir = ${prefix}/lib/pkcs11 + MAINTAINERCLEANFILES = Makefile.in SUBDIRS = . rsaref -libdir = ${prefix}/lib/pkcs11 - INCLUDES = @CFLAGS_OPENSC@ LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBOPENSC@ diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am index 02bee869..d1be902d 100644 --- a/src/pkcs15init/Makefile.am +++ b/src/pkcs15init/Makefile.am @@ -1,5 +1,7 @@ # Process this file with automake to create Makefile.in +includedir = ${prefix}/include/opensc + MAINTAINERCLEANFILES = Makefile.in INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" diff --git a/src/scconf/Makefile.am b/src/scconf/Makefile.am index d2f705b8..241ef324 100644 --- a/src/scconf/Makefile.am +++ b/src/scconf/Makefile.am @@ -1,5 +1,7 @@ # Process this file with automake to create Makefile.in +includedir = ${prefix}/include/opensc + MAINTAINERCLEANFILES = Makefile.in lex-parse.c include_HEADERS = scconf.h diff --git a/src/scldap/Makefile.am b/src/scldap/Makefile.am index 7a0d4aa3..95e34299 100644 --- a/src/scldap/Makefile.am +++ b/src/scldap/Makefile.am @@ -1,5 +1,7 @@ # Process this file with automake to create Makefile.in +includedir = ${prefix}/include/opensc + MAINTAINERCLEANFILES = Makefile.in include_HEADERS = scldap.h diff --git a/src/scrandom/Makefile.am b/src/scrandom/Makefile.am index df7a2a11..4119e020 100644 --- a/src/scrandom/Makefile.am +++ b/src/scrandom/Makefile.am @@ -1,5 +1,7 @@ # Process this file with automake to create Makefile.in +includedir = ${prefix}/include/opensc + MAINTAINERCLEANFILES = Makefile.in include_HEADERS = scrandom.h diff --git a/src/sia/Makefile.am b/src/sia/Makefile.am index a32c14ac..5ce05e11 100644 --- a/src/sia/Makefile.am +++ b/src/sia/Makefile.am @@ -1,9 +1,9 @@ # Process this file with automake to create Makefile.in -MAINTAINERCLEANFILES = Makefile.in - libdir = ${prefix}/lib/security +MAINTAINERCLEANFILES = Makefile.in + INCLUDES = -I../scam LDFLAGS = @LDFLAGS@ @LIBDL@ ../scam/libsiascam.la diff --git a/src/signer/Makefile.am b/src/signer/Makefile.am index f0b0e53d..a8356367 100644 --- a/src/signer/Makefile.am +++ b/src/signer/Makefile.am @@ -1,5 +1,7 @@ ## Makefile.am -- Process this file with automake to produce Makefile.in +plugindir = $(PLUGINDIR) + MAINTAINERCLEANFILES = Makefile.in SUBDIRS = . npinclude @@ -8,8 +10,6 @@ EXTRA_DIST = testprog.c INCLUDES = @CFLAGS_OPENSC@ @CFLAGS_ASSUAN@ -plugindir = $(PLUGINDIR) - if HAVE_SSL if HAVE_ASSUAN plugin_LTLIBRARIES = opensc-signer.la