[Pcsclite-cvs-commit] r6664 - in trunk/Drivers/ccid: . src

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2013-06-18 09:07:58 +0000 (Tue, 18 Jun 2013)
New Revision: 6664

Modified:
   trunk/Drivers/ccid/configure.ac
   trunk/Drivers/ccid/src/Makefile.am
Log:
Use serialconfdir from pcsc-lite

Get the serialconfdir value from pcsc-lite pkg config instead of using
$(DESTDIR)/$(sysconfdir)/reader.conf.d/


Modified: trunk/Drivers/ccid/configure.ac
===================================================================
--- trunk/Drivers/ccid/configure.ac	2013-06-18 08:56:16 UTC (rev 6663)
+++ trunk/Drivers/ccid/configure.ac	2013-06-18 09:07:58 UTC (rev 6664)
@@ -211,6 +211,15 @@
 	ccidtwindir=$usbdropdir/serial
 fi
 
+# --enable-serialconfdir=DIR
+AC_ARG_ENABLE(serialconfdir,
+	AS_HELP_STRING([--enable-serialconfdir=dir],[directory containing
+		serial drivers (default to pcscd config)]),
+	[serialconfdir="${enableval}"], [serialconfdir=false])
+if test "${serialconfdir}" = false ; then
+	serialconfdir=`$PKG_CONFIG libpcsclite --variable=serialconfdir`
+fi
+
 # --disable-pcsclite
 AC_ARG_ENABLE(pcsclite,
 	AS_HELP_STRING([--disable-pcsclite],[do not use pcsc-lite debug support]),
@@ -256,6 +265,7 @@
 AC_SUBST(bundle)
 AC_SUBST(usbdropdir)
 AC_SUBST(ccidtwindir)
+AC_SUBST(serialconfdir)
 AS_AC_EXPAND(bindir_exp,$bindir)
 AS_AC_EXPAND(sysconfdir_exp,$sysconfdir)
 
@@ -294,6 +304,7 @@
 USB drop directory:      ${usbdropdir}
 serial Twin support:     ${twinserial}
 serial twin install dir: ${ccidtwindir}
+serial config directory: ${serialconfdir}
 compiled for pcsc-lite:  ${pcsclite}
 class driver:            ${class}
 

Modified: trunk/Drivers/ccid/src/Makefile.am
===================================================================
--- trunk/Drivers/ccid/src/Makefile.am	2013-06-18 08:56:16 UTC (rev 6663)
+++ trunk/Drivers/ccid/src/Makefile.am	2013-06-18 09:07:58 UTC (rev 6664)
@@ -91,8 +91,8 @@
 install_ccidtwin: libccidtwin.la
 	$(mkinstalldirs) $(DESTDIR)$(ccidtwindir)
 	cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)
-	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/reader.conf.d ; \
-		perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/$(sysconfdir)/reader.conf.d/libccidtwin
+	$(mkinstalldirs) $(DESTDIR)/$(serialconfdir) ; \
+		perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/$(serialconfdir)/libccidtwin
 
 # do not uninstall the serial driver by default
 # use explicitely 'make uninstall_ccidtwin'