[Pcsclite-cvs-commit] r5093 - /trunk/PCSC/configure.in

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Aug  2 07:39:33 2010
New Revision: 5093

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5093
Log:
Use $libdir instead of $prefix/lib to set the default value of usbdropdir

" Fedora uses /usr/lib on 32 bit and /usr/lib64 on 64 bit multilib
platforms. "

Thanks to Kalev Lember for the idea.
http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0108.html

Modified:
    trunk/PCSC/configure.in

Modified: trunk/PCSC/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/configure.in?rev=5093&op=diff
==============================================================================
--- trunk/PCSC/configure.in (original)
+++ trunk/PCSC/configure.in Mon Aug  2 07:39:33 2010
@@ -275,12 +275,14 @@
 				  drivers (default /usr/local/lib/pcsc/drivers)]),
 [usbdropdir="${enableval}"], [usbdropdir=false])
 if test x${usbdropdir} = xfalse ; then
-	if test "x$prefix" != xNONE; then
-		usbdropdir="$prefix/lib/pcsc/drivers"
+	if test "x$libdir" != xNONE; then
+		usbdropdir="$libdir/pcsc/drivers"
 	else
-		usbdropdir="$ac_default_prefix/lib/pcsc/drivers"
+		usbdropdir="$ac_default_libdir/pcsc/drivers"
 	fi
 fi
+AS_AC_EXPAND(usbdropdir_exp,$usbdropdir)
+usbdropdir=$usbdropdir_exp
 AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$usbdropdir", [directory containing USB drivers])
 PCSCLITE_FEATURES="${PCSCLITE_FEATURES} usbdropdir=${usbdropdir}"