s4-torture: Test rpc schannel netr_LogonGetCapability.

[mat/samba.git] / dynconfig / wscript

diff --git a/dynconfig/wscript b/dynconfig/wscript
index f0a468e666a8cf0df90cfc70240d1506e8a37a37..374ede27bcd023fa97b16830496ffeaa6f963287 100755 (executable)
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -142,8 +142,8 @@ dynconfig = {
          'FHS-PATH':  '${DATADIR}/samba/codepages',
     },
     'PAMMODULESDIR' : {
-         'STD-PATH':  '${LIBDIR}',
-         'FHS-PATH':  '${LIBDIR}',
+         'STD-PATH':  '${LIBDIR}/security',
+         'FHS-PATH':  '${LIBDIR}/security',
          'OPTION':    '--with-pammodulesdir',
          'HELPTEXT':  'Which directory to use for PAM modules',
     },
@@ -173,7 +173,7 @@ dynconfig = {
     },
     'STATEDIR' : {
          'STD-PATH':  '${LOCALSTATEDIR}/locks',
-         'FHS-PATH':  '${LOCALSTATEDIR}/lib/samba/',
+         'FHS-PATH':  '${LOCALSTATEDIR}/lib/samba',
          'OPTION':    '--with-statedir',
          'HELPTEXT':  'Where to put persistent state files',
     },
@@ -340,6 +340,8 @@ def dynconfig_cflags(bld, list=None):
     override = { 'MODULESDIR'    : 'bin/modules',
                  'PYTHONDIR'     : 'bin/python',
                  'PYTHONARCHDIR' : 'bin/python',
+                 'BINDIR'        : 'bin',
+                 'SBINDIR'       : 'bin',
                  'CODEPAGEDIR'   : os.path.join(bld.env.srcdir, 'codepages'),
                  'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'),
                  'SETUPDIR'      : os.path.join(bld.env.srcdir, 'source4/setup') }
@@ -357,8 +359,6 @@ Build.BuildContext.dynconfig_cflags = dynconfig_cflags
 def build(bld):
     cflags = bld.dynconfig_cflags()
     version_header = 'version.h'
-    if not os.getenv('TOPLEVEL_BUILD'):
-        version_header = 'include/version.h'
     bld.SAMBA_SUBSYSTEM('DYNCONFIG',
                         'dynconfig.c',
                         deps='replace talloc',