URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5060
Log: set --sysconfdir=/etc/reader.conf.d so that we parse any file in this
directory
[...]
- --sysconfdir=/etc \
+ --sysconfdir=/etc/reader.conf.d \
It's more common to set sysconfdir to /etc and have configure script
figure out the subdirectory. The configure script should always default
to sane values when no arguments are specified. The default value for
sysconfdir is /usr/local/etc; so the configure script should just append
/reader.conf.d to that. Right now if the user doesn't override sysconfdir,
pcsc will try to go through every .conf file in /usr/local/etc, and I
don't think anything good will come out of that.
I have a patch attached which should make it more idiomatic: default to
$sysconfdir/reader.conf.d directory.
--
Kalev
Index: configure.in
===================================================================
--- configure.in (revision 5063)
+++ configure.in (working copy)
@@ -332,7 +332,9 @@
AS_AC_EXPAND(sbindir_exp,$sbindir)
AS_AC_EXPAND(localstatedir_exp,$localstatedir)
-PCSCLITE_FEATURES="${PCSCLITE_FEATURES} sysconfdir=${sysconfdir_exp}"
+PCSCLITE_CONFIG_DIR="${sysconfdir_exp}/reader.conf.d"
+AC_SUBST(PCSCLITE_CONFIG_DIR)
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} configdir=${PCSCLITE_CONFIG_DIR}"
AC_DEFINE_UNQUOTED([PCSCLITE_FEATURES], ["${PCSCLITE_FEATURES}"], [Enabled
PC/SC lite features])
PCSCD_BINARY="${sbindir_exp}/pcscd"
AC_DEFINE_UNQUOTED([PCSCD_BINARY], ["$PCSCD_BINARY"], [pcscd filename])
@@ -343,7 +345,7 @@
Version: ${PACKAGE_VERSION}
System binaries: $(eval eval eval echo "${sbindir_exp}")
-Configuration dir: $(eval eval eval echo "${sysconfdir_exp}")
+Configuration dir: ${PCSCLITE_CONFIG_DIR}
Host: ${host}
Index: src/pcscd.h.in
===================================================================
--- src/pcscd.h.in (revision 5063)
+++ src/pcscd.h.in (working copy)
@@ -23,7 +23,7 @@
#define SCARD_INSERTED 0x0002 /**< Card was inserted */
#define SCARD_REMOVED 0x0004 /**< Card was removed */
-#define PCSCLITE_CONFIG_DIR "@sysconfdir_exp@"
+#define PCSCLITE_CONFIG_DIR "@PCSCLITE_CONFIG_DIR@"
#define PCSCLITE_IPC_DIR USE_IPCDIR
#define PCSCLITE_RUN_PID PCSCLITE_IPC_DIR "/pcscd.pid"
Index: c.sh
===================================================================
--- c.sh (revision 5063)
+++ c.sh (working copy)
@@ -8,7 +8,7 @@
./configure \
--prefix=/usr \
- --sysconfdir=/etc/reader.conf.d \
+ --sysconfdir=/etc \
--enable-usbdropdir=/usr/lib/pcsc/drivers \
--enable-muscledropdir=/usr/lib/pcsc/services \
--enable-maintainer-mode \
_______________________________________________
Muscle mailing list
[email protected]
http://lists.drizzle.com/mailman/listinfo/muscle
