From: Kern Sibbald Date: Wed, 15 Oct 2008 12:56:19 +0000 (+0000) Subject: Fix includedir bug in autoconf X-Git-Tag: Release-7.0.0~3939 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d4a77b6c332aeca85984fe4994c00168c30f540c;p=bacula%2Fbacula Fix includedir bug in autoconf git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7808 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 68cae0a1ec..c48dc89f6e 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -227,17 +227,19 @@ if test x${prefix} = xNONE ; then fi if test `eval echo ${libdir}` = NONE/lib ; then - sysconfdir=/usr/lib + libdir=/usr/lib fi if test `eval echo ${includedir}` = NONE/include ; then - sysconfdir=/usr/include + includedir=/usr/include fi prefix= fi sysconfdir=`eval echo ${sysconfdir}` datarootdir=`eval echo ${datarootdir}` +libdir=`eval echo ${libdir}` +includedir=`eval echo ${includedir} localedir=`eval echo ${datarootdir}/locale` AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir") AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir") diff --git a/bacula/configure b/bacula/configure index dd2f258499..e7e8eacf5e 100755 --- a/bacula/configure +++ b/bacula/configure @@ -18273,17 +18273,19 @@ if test x${prefix} = xNONE ; then fi if test `eval echo ${libdir}` = NONE/lib ; then - sysconfdir=/usr/lib + libdir=/usr/lib fi if test `eval echo ${includedir}` = NONE/include ; then - sysconfdir=/usr/include + includedir=/usr/include fi prefix= fi sysconfdir=`eval echo ${sysconfdir}` datarootdir=`eval echo ${datarootdir}` +libdir=`eval echo ${libdir}` +includedir=`eval echo ${includedir} localedir=`eval echo ${datarootdir}/locale` cat >>confdefs.h <<_ACEOF #define SYSCONFDIR "$sysconfdir"