Author: metze Date: 2006-01-26 12:59:55 +0000 (Thu, 26 Jan 2006) New Revision: 13163
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13163 Log: as we don't import the raw magic configure vars for libdir, datadir, sysconfdir,localstatedir into our Makefile we need to expand them in configure I'll maybe rework this later but for now this works metze Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4 branches/SAMBA_4_0/source/build/smb_build/makefile.pm Changeset: Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/check_path.m4 2006-01-26 12:04:43 UTC (rev 13162) +++ branches/SAMBA_4_0/source/build/m4/check_path.m4 2006-01-26 12:59:55 UTC (rev 13163) @@ -12,20 +12,21 @@ 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" ) ################################################# Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-01-26 12:04:43 UTC (rev 13162) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-01-26 12:59:55 UTC (rev 13163) @@ -70,12 +70,10 @@ 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
