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

fixed default location of reader.conf.d

Browse Source 
use `./configure --confdir` for changing the default
This commit is contained in:
Frank Morgner
2013-06-11 23:13:42 +02:00
parent 3573f11f88
commit 58dc2e1a01
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
virtualsmartcard/configure.ac
View File

@@ -74,6 +74,13 @@ if test "${serialdropdir}" = false ; then
fi fi
# --enable-confdir=DIR
AC_ARG_ENABLE(confdir,
AC_HELP_STRING([--enable-confdir=DIR],[directory to install the
vpcd configuration (default to pcscd config or /etc/reader.conf.d)]),
[confdir="${enableval}"], [confdir=/etc/reader.conf.d])
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS([arpa/inet.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) AC_CHECK_HEADERS([arpa/inet.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
@@ -90,6 +97,7 @@ AC_SUBST(BUNDLE_HOST)
AC_SUBST(DYN_LIB_EXT) AC_SUBST(DYN_LIB_EXT)
AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_PREFIX)
AC_SUBST(serialdropdir) AC_SUBST(serialdropdir)
AC_SUBST(confdir)
case "$host" in case "$host" in
*-*-darwin*) *-*-darwin*)
BUNDLE_HOST="MacOS" BUNDLE_HOST="MacOS"
@@ -133,7 +141,7 @@ ${PACKAGE} has been configured with following options:
Version: ${PACKAGE_VERSION} Version: ${PACKAGE_VERSION}
User binaries: $(eval eval eval echo "${bindir}") User binaries: $(eval eval eval echo "${bindir}")
PC/SC configuration: $(eval eval eval echo "${sysconfdir}/reader.conf.d") PC/SC configuration: ${confdir}
Python site-packages: $(eval eval eval echo "${pythondir}") Python site-packages: $(eval eval eval echo "${pythondir}")
Driver directory: ${serialdropdir} Driver directory: ${serialdropdir}

6
virtualsmartcard/src/vpcd/Makefile.am
View File

@@ -21,8 +21,8 @@ install_libvpcd: libvpcd.la reader.conf.in
$(LIBTOOL) --mode=install cp .libs/$(VPCD_LIB) $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION) $(LIBTOOL) --mode=install cp .libs/$(VPCD_LIB) $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION)
(cd $(DESTDIR)$(serialdropdir) && \ (cd $(DESTDIR)$(serialdropdir) && \
$(LN_S) -f $(VPCD_LIB).$(VERSION) $(VPCD_LIB)) $(LN_S) -f $(VPCD_LIB).$(VERSION) $(VPCD_LIB))
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/reader.conf.d $(mkinstalldirs) $(DESTDIR)$(confdir)
$(do_subst) < $(srcdir)/reader.conf.in > $(DESTDIR)$(sysconfdir)/reader.conf.d/vpcd $(do_subst) < $(srcdir)/reader.conf.in > $(DESTDIR)$(confdir)/vpcd
uninstall: uninstall_libvpcd uninstall: uninstall_libvpcd
@@ -30,4 +30,4 @@ uninstall: uninstall_libvpcd
uninstall_libvpcd: uninstall_libvpcd:
rm -f $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION) \ rm -f $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION) \
$(DESTDIR)$(serialdropdir)/$(VPCD_LIB) \ $(DESTDIR)$(serialdropdir)/$(VPCD_LIB) \
$(DESTDIR)$(sysconfdir)/reader.conf.d/vpcd $(DESTDIR)$(confdir)/vpcd