move libraries from lib/pkcs11 to lib/,

rename the engine dir to engine, and
make it "openssl" so openssl can load
the engines automaticaly.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2350 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aj 2005-06-15 08:56:15 +00:00
parent a6db0256c9
commit 4568015476
2 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
# Process this file with automake to create Makefile.in
bundledir = @BUNDLEDIR@/pkcs11
libdir = @libdir@/pkcs11
libdir = @libdir@
includedir = @includedir@/opensc
MAINTAINERCLEANFILES = Makefile.in

View File

@ -1,7 +1,7 @@
# Process this file with automake to create Makefile.in
bundledir = @BUNDLEDIR@/opensc
libdir = @libdir@/opensc
enginedir = @libdir@/openssl
MAINTAINERCLEANFILES = Makefile.in
@ -9,7 +9,7 @@ EXTRA_DIST = Makefile.mak engine_pkcs11.def test_engine.sh \
$(engine_opensc_la_SOURCES) $(engine_pkcs11_la_SOURCES)
if HAVE_ENGINE
lib_LTLIBRARIES = engine_opensc.la engine_pkcs11.la
engine_LTLIBRARIES = engine_opensc.la engine_pkcs11.la
endif
OPENSSL_CFLAGS = \
@ -34,9 +34,9 @@ engine_pkcs11_la_LDFLAGS = @OPENSSL_LDFLAGS@ -module -avoid-version
install-exec-local: install-libLTLIBRARIES
if HAVE_ENGINE
if HAVE_BUNDLES
-${top_srcdir}/macos/libtool-bundle $(DESTDIR)$(libdir)/engine_opensc.so \
-${top_srcdir}/macos/libtool-bundle $(DESTDIR)$(enginedir)/engine_opensc.so \
$(DESTDIR)$(bundledir)/
-${top_srcdir}/macos/libtool-bundle $(DESTDIR)$(libdir)/engine_pkcs11.so \
-${top_srcdir}/macos/libtool-bundle $(DESTDIR)$(enginedir)/engine_pkcs11.so \
$(DESTDIR)$(bundledir)/
endif
endif