Fix codepagedir to follow predefined libdir when using FHS. Fixes x86_64 build.

(This used to be commit b8e582c9941d2466a403e476c52026f4b4201062)

diff --git a/source3/configure.in b/source3/configure.in
index 84ae6f7e507423a885ccdb0f62aebc3e77239ba8..7272ae4d9acbb57089900f71557ec5c8ce84222e 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -65,10 +65,10 @@ AC_ARG_WITH(fhs,
     mandir="\${prefix}/share/man"
     logfilebase="\${VARDIR}/log/samba"
     privatedir="\${CONFIGDIR}/private"
-    libdir="\${prefix}/lib/samba"
+    test "${libdir}" || libdir="\${prefix}/lib/samba"
     configdir="\${sysconfdir}/samba"
     swatdir="\${DATADIR}/samba/swat"
-    codepagedir="\${prefix}/lib/samba"
+    codepagedir="\${LIBDIR}"
     statedir="\${VARDIR}/lib/samba"
     cachedir="\${VARDIR}/lib/samba"
     AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])