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 68cae0a1ecfab1d732812903040f4b0cc0dc0e70..c48dc89f6eaefe3d0a69d15f45d2c88705327926 100644 (file)
--- 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 dd2f258499c13483941e0b60f6b018327db6697e..e7e8eacf5e2c367f45bd858b3e3b8a1f7dae1edb 100755 (executable)
--- 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"