[SCM] Samba Shared Repository - branch master updated
Simo Sorce
idra at samba.org
Mon Feb 14 20:23:01 MST 2011
The branch, master has been updated
via 18926e5 Fix private libdir and codepages paths
from 64c63a3 s3: Fix a C++ warning
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 18926e5907ac91881fe5b8cf35193c4bc010500a
Author: Simo Sorce <idra at samba.org>
Date: Mon Feb 14 19:46:42 2011 -0500
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 at samba.org>
Autobuild-Date: Tue Feb 15 04:22:37 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wscript | 2 +-
source4/dynconfig/wscript | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
mode change 100644 => 100755 buildtools/wafsamba/wscript
mode change 100644 => 100755 source4/dynconfig/wscript
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
old mode 100644
new mode 100755
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
new mode 100755
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):
--
Samba Shared Repository
More information about the samba-cvs
mailing list