svn commit: samba r13153 - in branches/SAMBA_4_0/source: . build/m4 build/smb_build script

[Stefan (metze) Metzmacher]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

abartlet at samba.org schrieb:
> Author: abartlet
> Date: 2006-01-26 05:57:53 +0000 (Thu, 26 Jan 2006)
> New Revision: 13153
> 
> WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13153
> 
> Log:
> Try to move closer to FHS.  This probably breaks everything...
> 
> Andrew Bartlett
> 
> Modified:
>    branches/SAMBA_4_0/source/build/m4/check_path.m4
>    branches/SAMBA_4_0/source/build/smb_build/makefile.pm
>    branches/SAMBA_4_0/source/main.mk
>    branches/SAMBA_4_0/source/script/installmisc.sh
> 
> 
> 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 05:05:26 UTC (rev 13152)
> +++ branches/SAMBA_4_0/source/build/m4/check_path.m4	2006-01-26 05:57:53 UTC (rev 13153)
> @@ -12,22 +12,21 @@
>  AC_PREFIX_DEFAULT(/usr/local/samba)
>  
>  # Defaults and --without-fhs
> -    configdir="\${LIBDIR}"
>      logfilebase="\${localstatedir}"
>      lockdir="\${localstatedir}/locks"
> -    piddir="\${localstatedir}/locks"
> +    piddir="\${localstatedir}/run"
>      privatedir="\${prefix}/private"
> -    swatdir="\${prefix}/swat"
>  
>  AC_ARG_WITH(fhs, 
>  [  --with-fhs              Use FHS-compliant paths (default=no)],
> -    configdir="${sysconfdir}/samba"
>      lockdir="\${localstatedir}/lib/samba"
>      piddir="\${localstatedir}/run/samba"
>      logfilebase="\${localstatedir}/log/samba"
> -    privatedir="\${CONFIGDIR}/private"
> -    libdir="\${prefix}/lib/samba"
> -    swatdir="\${datadir}/samba/swat")
> +    privatedir="\${localstatedir}/lib/samba/private"
> +    libdir="\${libdir}/samba"
> +    datadir="\${datadir}/samba"
> +    includedir="\${includedir}/samba-4.0"
> +)

shouldn't we do a syconfdir="\${sysconfdir}/samba" here too?

for things like rpm packages this should be usable

./configure \
	--prefix=%{_prefix} \
	--sysconfdir=%{_sysconfdir} \
	--localstatedir=%{_localstatedir} \
	--datadir=%{_datadir} \
	--with-fhs

metze
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFD2Jlgm70gjA5TCD8RAsL1AKCWH4qPgnC7/16ubfmCliEivMVtxwCffm1+
1nBDjNrK30ss3Y6Wj2EAiG8=
=AUL6
-----END PGP SIGNATURE-----