41 lines
1.6 KiB
Plaintext
41 lines
1.6 KiB
Plaintext
Index: src/pkcs11/Makefile.am
|
|
--- src/pkcs11/Makefile.am.orig
|
|
+++ src/pkcs11/Makefile.am
|
|
@@ -1,7 +1,9 @@
|
|
include $(top_srcdir)/win32/ltrc.inc
|
|
|
|
+override libdir = $(prefix)/lib/pkcs11
|
|
+
|
|
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-pkcs11.rc $(srcdir)/versioninfo-pkcs11-spy.rc
|
|
EXTRA_DIST = Makefile.mak versioninfo-pkcs11.rc.in versioninfo-pkcs11-spy.rc.in opensc-pkcs11.pc.in opensc-pkcs11.dll.manifest onepin-opensc-pkcs11.dll.manifest
|
|
|
|
lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la onepin-opensc-pkcs11.la
|
|
if ENABLE_SHARED
|
|
@@ -24,10 +26,6 @@ OPENSC_PKCS11_LIBS = \
|
|
$(top_builddir)/src/common/libcompat.la \
|
|
$(OPENPACE_LIBS) $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS)
|
|
|
|
-pkgconfigdir = $(libdir)/pkgconfig
|
|
-pkgconfig_DATA = opensc-pkcs11.pc
|
|
-DISTCLEANFILES = $(pkgconfig_DATA)
|
|
-
|
|
opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC)
|
|
opensc_pkcs11_la_CFLAGS = $(OPENSC_PKCS11_CFLAGS)
|
|
opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
|
|
@@ -69,15 +67,6 @@ install-exec-hook:
|
|
for l in opensc-pkcs11.dll pkcs11-spy.dll; do \
|
|
mv "$(DESTDIR)$(libdir)/$$l" "$(DESTDIR)$(bindir)/$$l"; \
|
|
done
|
|
-else
|
|
-# see http://wiki.cacert.org/wiki/Pkcs11TaskForce
|
|
-install-exec-hook:
|
|
- $(MKDIR_P) "$(DESTDIR)$(pkcs11dir)"
|
|
- for l in opensc-pkcs11$(DYN_LIB_EXT) onepin-opensc-pkcs11$(DYN_LIB_EXT) pkcs11-spy$(DYN_LIB_EXT); do \
|
|
- rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
|
|
- $(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \
|
|
- done
|
|
-
|
|
endif
|
|
|
|
TIDY_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(OPENSC_PKCS11_CFLAGS)
|