Changeset 1122

Timestamp:

01/21/09 17:29:10 (3 years ago)

Author:

alonbl

Message:

Fix default ifdhandler path

File:

• trunk/configure.ac (modified) (3 diffs)

trunk/configure.ac

@@ -77 +77 @@
 esac
 
-usrlibdir="/usr/lib${libdir##*/lib}"
-usrsbindir="/usr/sbin${libdir##*/sbin}"
-
+full_libdir=`eval eval eval eval eval echo "${libdir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
+full_sbindir=`eval eval eval eval eval echo "${sbindir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
 full_sysconfdir=`eval eval eval eval eval echo "${sysconfdir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
 full_localstatedir=`eval eval eval eval eval echo "${localstatedir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
@@ -193 +192 @@
         [AS_HELP_STRING([--with-ifddir],[ifd directory @<:@/usr/lib/ifd@:>@])],
         [ifddir="${withval}"],
-        [ifddir="${usrlibdir}/ifd"]
+        [ifddir="${full_libdir}/ifd"]
 )
 
@@ -406 +405 @@
 OPENCT_SOCKET_PATH="${full_localstatedir}/run/openct"
 AC_DEFINE_UNQUOTED([OPENCT_SOCKET_PATH], ["${OPENCT_SOCKET_PATH}"], [socket path for libopenct])
-AC_DEFINE_UNQUOTED([OPENCT_IFDHANDLER_PATH], ["${usrsbindir}/ifdhandler"], [ifdhandler path for libopenct])
+AC_DEFINE_UNQUOTED([OPENCT_IFDHANDLER_PATH], ["${full_sbindir}/ifdhandler"], [ifdhandler path for libopenct])
 
 AC_CREATE_STDINT_H([src/include/openct/types.h])