VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

minor fixes

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@637 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2011-12-01 16:45:12 +00:00
parent f6af548d37
commit d437c97dd9
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
npa/Makefile.am
View File

@@ -51,13 +51,30 @@ $(opensc_root)/lib/libnpa.la: $(opensc_root)/lib/libopensc.la
--program-prefix='' \ --program-prefix='' \
PKG_CONFIG_PATH="$(opensc_root)/lib/pkgconfig" \ PKG_CONFIG_PATH="$(opensc_root)/lib/pkgconfig" \
PKG_CONFIG_SYSROOT_DIR="$(opensc_root)" \ PKG_CONFIG_SYSROOT_DIR="$(opensc_root)" \
OPENSC_LIBS="-L$(opensc_root)/lib -lopensc" OPENSC_LIBS="-L$(opensc_root)/lib -lopensc" || ($(restore_la) && false)
make install DESTDIR="$(opensc_root)" make install DESTDIR="$(opensc_root)" || ($(restore_la) && false)
$(restore_la) $(restore_la)
win-opensc: $(opensc_root)/lib/libopensc.la win-opensc: $(opensc_root)/lib/libopensc.la
win: $(opensc_root)/lib/libnpa.la win: $(opensc_root)/lib/libnpa.la
mkdir -p npa-win32
for i in \
$(opensc_root)/bin/*npa*.dll \
$(opensc_root)/bin/*opensc*.dll \
$(opensc_root)/bin/*eay*.dll \
$(opensc_root)/bin/*ltdl*.dll \
$(opensc_root)/bin/*zlib*.dll \
$(opensc_root)/bin/npa-tool.exe \
; do cp $${i} npa-win32; done
mkdir -p npa-win32/include
for i in \
$(opensc_root)/include/openssl \
$(opensc_root)/include/npa \
; do cp -r $${i} npa-win32/include; done
mkdir -p npa-win32/include/libopensc
cp $(srcdir)/src/opensc/src/libopensc/*.h npa-win32/include/libopensc
rm -f npa-win32/*pkcs* npa-win32/include/libopensc/*internal*.h
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnpa.pc pkgconfig_DATA = libnpa.pc

2
npa/configure.ac
View File

@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([nPA smart card library], [0.4], [http://sourceforge.net/projects/vsmartcard/support], [npa], [http://sourceforge.net/projects/vsmartcard/]) AC_INIT([nPA Smart Card Library], [0.4], [http://sourceforge.net/projects/vsmartcard/support], [npa], [http://sourceforge.net/projects/vsmartcard/])
AC_CONFIG_SRCDIR([src/npa.c]) AC_CONFIG_SRCDIR([src/npa.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])