diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-04-29 08:29:56 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-04-29 12:36:46 +0200 |
| commit | 8e792d7b9bd1f9ce35fdaf6db4fc1d08e2ba8bda (patch) | |
| tree | 5c9dd4799dca75bd776dcb99deaa8270a591f199 | |
| parent | 48fb78eba6cfe8ddccc6af10170c0537a260c6b1 (diff) | |
| download | samba-8e792d7b9bd1f9ce35fdaf6db4fc1d08e2ba8bda.tar.gz samba-8e792d7b9bd1f9ce35fdaf6db4fc1d08e2ba8bda.tar.bz2 samba-8e792d7b9bd1f9ce35fdaf6db4fc1d08e2ba8bda.zip | |
s4:dynconfig: fix fhs variables and list them all explicit
This adds 'samba' subdirs to smb.conf and setup.
metze
| -rw-r--r-- | source4/dynconfig/wscript | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 8d9234e963..1d9a603bdd 100644 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -39,23 +39,26 @@ dyn_cflags = { # changes for when FHS is enabled dyn_cflags_fhs = { + 'BINDIR' : '${BINDIR}', + 'SBINDIR' : '${SBINDIR}', 'CONFIGDIR' : '${SYSCONFDIR}/samba', - 'CONFIGFILE' : '${CONFIGDIR}/smb.conf', - 'LMHOSTSFILE' : '${CONFIGDIR}/lmhosts', + 'CONFIGFILE' : '${SYSCONFDIR}/samba/smb.conf', + 'LMHOSTSFILE' : '${SYSCONFDIR}/samba/lmhosts', + 'PRIVATE_DIR' : '${LOCALSTATEDIR}/lib/samba/private', + 'LOGFILEBASE' : '${LOCALSTATEDIR}/log/samba', 'LOCKDIR' : '${LOCALSTATEDIR}/lib/samba', 'PIDDIR' : '${LOCALSTATEDIR}/run/samba', - 'LOGFILEBASE' : '${LOCALSTATEDIR}/log/samba', - 'PRIVATE_DIR' : '${LOCALSTATEDIR}/lib/samba/private', - 'MODULESDIR' : '${LIBDIR}/samba', 'DATADIR' : '${DATADIR}/samba', - 'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0', - 'NTP_SIGND_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/ntp_signd', + 'SETUPDIR' : '${DATADIR}/samba/setup', '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', - 'SWATDIR' : '${DATADIR}/swat', - 'SETUPDIR' : '${DATADIR}/setup', + 'PYTHONDIR' : '${PYTHONDIR}', + 'MODULESDIR' : '${LIBDIR}/samba', + 'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0', 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig', + 'SWATDIR' : '${DATADIR}/swat', } def get_varname(v): |