summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2011-02-14 19:46:42 -0500
committerSimo Sorce <idra@samba.org>2011-02-15 04:22:37 +0100
commit18926e5907ac91881fe5b8cf35193c4bc010500a (patch)
tree4fd18bf3827d3c21ee30adc0bb56ac389d5794d5
parent64c63a3e1ca7206cb3bb11ff6c8c206bb9a00444 (diff)
downloadsamba-18926e5907ac91881fe5b8cf35193c4bc010500a.tar.gz
samba-18926e5907ac91881fe5b8cf35193c4bc010500a.tar.bz2
samba-18926e5907ac91881fe5b8cf35193c4bc010500a.zip
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
-rwxr-xr-x[-rw-r--r--]buildtools/wafsamba/wscript2
-rwxr-xr-x[-rw-r--r--]source4/dynconfig/wscript2
2 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index ad5b938df5..4f93bb1793 100644..100755
--- 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
index 50ae44f9ad..c2741fd875 100644..100755
--- 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):