Fix private libdir and codepages paths

The private libraries need to be arch specific as well.

With --enable-fhs the codepages should go in /usr/share/samba and not
in /usr/lib{64}/samba as they are data files not libraries.

Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Tue Feb 15 04:22:37 CET 2011 on sn-devel-104

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
old mode 100644 (file)
new mode 100755 (executable)
index ad5b938..4f93bb1
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -277,7 +277,7 @@ def configure(conf):
         conf.env.RPATH_ON_INSTALL = (conf.env.RPATH_ON_BUILD and
                                      not Options.options.disable_rpath_install)
         if not conf.env.PRIVATELIBDIR:
-            conf.env.PRIVATELIBDIR = '${PREFIX}/lib/%s' % Utils.g_module.APPNAME
+            conf.env.PRIVATELIBDIR = '%s/%s' % (conf.env.LIBDIR, Utils.g_module.APPNAME)
         conf.env.RPATH_ON_INSTALL_PRIVATE = (
             not Options.options.disable_rpath_private_install)
     else:

diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
old mode 100644 (file)
new mode 100755 (executable)
index 50ae44f..c2741fd
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -57,7 +57,6 @@ dyn_cflags_fhs = {
     'LOGFILEBASE'                    : '${LOCALSTATEDIR}/log/samba',
     'LOCKDIR'                        : '${LOCALSTATEDIR}/lib/samba',
     'PIDDIR'                         : '${LOCALSTATEDIR}/run/samba',
-    'DATADIR'                        : '${DATADIR}/samba',
     'SETUPDIR'                       : '${DATADIR}/samba/setup',
     'WINBINDD_SOCKET_DIR'            : '${LOCALSTATEDIR}/run/samba/winbindd',
     'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
@@ -69,6 +68,7 @@ dyn_cflags_fhs = {
     'INCLUDEDIR'                     : '${INCLUDEDIR}/samba-4.0',
     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
     'SWATDIR'                        : '${DATADIR}/swat',
+    'CODEPAGEDIR'                    : '${DATADIR}/samba',
     }
 
 def get_varname(v):