python-samba3: Secrets file loaded from private dir, not lib dir

[idra/samba.git] / source4 / scripting / python / wscript_build

diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 92215315af131a7a28065cd45f403fd025e15556..540f3b7bb7e7f4282f8879233beb241c67fb1d94 100644 (file)
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -2,30 +2,23 @@
 
 bld.SAMBA_LIBRARY('samba_python',
        source=[],
-       deps='LIBPYTHON PYTALLOC pyrpc_util',
+       deps='LIBPYTHON pytalloc-util pyrpc_util',
        grouping_library=True,
        private_library=True,
        pyext=True)
 
 bld.SAMBA_SUBSYSTEM('LIBPYTHON',
        source='modules.c',
-       public_deps='EXT_LIB_PYTHON',
+       public_deps='',
        init_function_sentinal='{NULL,NULL}',
        deps='talloc',
        pyext=True,
        )
 
 
-bld.SAMBA_SUBSYSTEM('PYTALLOC',
-       source='../../../lib/talloc/pytalloc.c',
-       public_deps='EXT_LIB_PYTHON talloc',
-       pyext=True,
-       )
-
-
 bld.SAMBA_PYTHON('python_uuid',
        source='uuidmodule.c',
-       deps='LIBNDR',
+       deps='ndr',
        realname='uuid.so',
        enabled = float(bld.env.PYTHON_VERSION) <= 2.4
        )
@@ -33,18 +26,14 @@ bld.SAMBA_PYTHON('python_uuid',
 
 bld.SAMBA_PYTHON('python_glue',
        source='pyglue.c',
-       deps='pyparam_util libsamba-util libnetif PYTALLOC',
+       deps='pyparam_util samba-util netif pytalloc-util',
        realname='samba/_glue.so'
        )
 
 
-# create a dummy subsystem for EXT_LIB_PYTHON
-bld.SAMBA_SUBSYSTEM('EXT_LIB_PYTHON', '')
-
-
 # install out various python scripts for use by make test
 bld.SAMBA_SCRIPT('samba_python',
                  pattern='samba/**/*.py',
                  installdir='python')
 
-bld.INSTALL_WILDCARD('${PYTHONDIR}', 'samba/**/*.py', flat=False)
+bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)