From 733425f312729bf4c26bfcea866f310bc9b6b5be Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Thu, 13 Dec 2007 14:23:04 +0300
Subject: [PATCH] Fix codepagedir to follow predefined libdir when using FHS.
 Fixes x86_64 build. (This used to be commit
 b8e582c9941d2466a403e476c52026f4b4201062)

---
 source3/configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source3/configure.in b/source3/configure.in
index 84ae6f7e507..7272ae4d9ac 100644
--- 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])
-- 
2.34.1