diff options
| author | James Peach <jpeach@samba.org> | 2007-12-13 20:56:53 -0800 |
|---|---|---|
| committer | James Peach <jpeach@samba.org> | 2007-12-13 20:56:53 -0800 |
| commit | 7b457645fb40d7195d75f8e38883b140abcb1955 (patch) | |
| tree | 90c3ca21cd40c98ed4c7c1580b75216f689fad97 /source3/configure.in | |
| parent | 12ac4c3119b3b7712e670d95d61413d97ecafaef (diff) | |
| parent | 138333ed1f571cd6bb76c3be655f70e35cd48a99 (diff) | |
| download | samba-7b457645fb40d7195d75f8e38883b140abcb1955.tar.gz samba-7b457645fb40d7195d75f8e38883b140abcb1955.tar.bz2 samba-7b457645fb40d7195d75f8e38883b140abcb1955.zip | |
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 0de2b3eb515f2da21ffd1ce54979bb1f8063024b)
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 84ae6f7e50..7272ae4d9a 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -65,10 +65,10 @@ AC_ARG_WITH(fhs, mandir="\${prefix}/share/man" logfilebase="\${VARDIR}/log/samba" privatedir="\${CONFIGDIR}/private" - libdir="\${prefix}/lib/samba" + test "${libdir}" || libdir="\${prefix}/lib/samba" configdir="\${sysconfdir}/samba" swatdir="\${DATADIR}/samba/swat" - codepagedir="\${prefix}/lib/samba" + codepagedir="\${LIBDIR}" statedir="\${VARDIR}/lib/samba" cachedir="\${VARDIR}/lib/samba" AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths]) |