diff options
| -rw-r--r-- | source4/build/m4/check_path.m4 | 23 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 2 |
2 files changed, 12 insertions, 13 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index b45368ccd9..293aac2427 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -12,20 +12,21 @@ dnl AC_PREFIX_DEFAULT(/usr/local/samba) # Defaults and --without-fhs - logfilebase="\${localstatedir}" - lockdir="\${localstatedir}/locks" - piddir="\${localstatedir}/run" - privatedir="\${prefix}/private" +logfilebase="${localstatedir}" +lockdir="${localstatedir}/locks" +piddir="${localstatedir}/run" +privatedir="${prefix}/private" AC_ARG_WITH(fhs, [ --with-fhs Use FHS-compliant paths (default=no)], - lockdir="\${localstatedir}/lib/samba" - piddir="\${localstatedir}/run/samba" - logfilebase="\${localstatedir}/log/samba" - privatedir="\${localstatedir}/lib/samba/private" - libdir="\${libdir}/samba" - datadir="\${datadir}/samba" - includedir="\${includedir}/samba-4.0" + lockdir="${localstatedir}/lib/samba" + piddir="${localstatedir}/run/samba" + logfilebase="${localstatedir}/log/samba" + privatedir="${localstatedir}/lib/samba/private" + sysconfdir="${sysconfdir}/samba" + libdir="${libdir}/samba" + datadir="${datadir}/samba" + includedir="${includedir}/samba-4.0" ) ################################################# diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 022fcaa9bc..a7540bc9f9 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -70,12 +70,10 @@ builddir = $self->{config}->{builddir} BASEDIR = $self->{config}->{prefix} BINDIR = $self->{config}->{bindir} SBINDIR = $self->{config}->{sbindir} -datadir = $self->{config}->{datadir} LIBDIR = $self->{config}->{libdir} MODULESDIR = $self->{config}->{libdir} INCLUDEDIR = $self->{config}->{includedir} CONFIGDIR = $self->{config}->{sysconfdir} -localstatedir = $self->{config}->{localstatedir} SWATDIR = $self->{config}->{datadir}/swat JSDIR = $self->{config}->{datadir}/js SETUPDIR = $self->{config}->{datadir}/setup |