dynconfig: Have only one dynconfig.o in the common code.
[sfrench/samba-autobuild/.git] / source4 / dynconfig / wscript
index 45f79368f9ec8b608261ee8e60c33d95579974f0..cc3ff45d35b3622c334f2ea81c80d341ac6fc108 100755 (executable)
@@ -44,6 +44,7 @@ dyn_cflags = {
     'STATEDIR'                       : '${LOCALSTATEDIR}',
     'CACHEDIR'                       : '${LOCKDIR}',
     'SMB_PASSWD_FILE'                : '${PRIVATEDIR}/smbpasswd',
+    'NMBDSOCKETDIR'                  : '${LOCALSTATEDIR}/nmbd',
     }
 
 # changes for when FHS is enabled
@@ -62,7 +63,7 @@ dyn_cflags_fhs = {
     'WINBINDD_SOCKET_DIR'            : '${LOCALSTATEDIR}/run/samba/winbindd',
     'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
     'NTP_SIGND_SOCKET_DIR'           : '${LOCALSTATEDIR}/run/samba/ntp_signd',
-    'NCALRPCDIR'                     : '${LOCALSTATEDIR}/ncalrpc',
+    'NCALRPCDIR'                     : '${LOCALSTATEDIR}/run/samba/ncalrpc',
     'PYTHONARCHDIR'                  : '${PYTHONARCHDIR}',
     'MODULESDIR'                     : '${LIBDIR}/samba',
     'LIBEXECDIR'                     : '${MODULESDIR}',
@@ -70,6 +71,7 @@ dyn_cflags_fhs = {
     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
     'SWATDIR'                        : '${DATADIR}/swat',
     'CODEPAGEDIR'                    : '${DATADIR}/samba',
+    'NMBDSOCKETDIR'                  : '${LOCALSTATEDIR}/run/samba/nmbd',
     }
 
 def get_varname(v):
@@ -144,7 +146,7 @@ Build.BuildContext.dynconfig_cflags = dynconfig_cflags
 def build(bld):
     cflags = bld.dynconfig_cflags()
     bld.SAMBA_SUBSYSTEM('DYNCONFIG',
-                        'dynconfig.c',
+                        '../../dynconfig/dynconfig.c',
                         deps='replace talloc',
                         public_headers=os_path_relpath(os.path.join(Options.launch_dir, 'version.h'), bld.curdir),
                         header_path='samba',