diff options
| author | Lars Müller <lmuelle@samba.org> | 2006-03-21 16:18:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:40 -0500 |
| commit | 49ba0a9e20939e4412fcf56ae2aef046a342424d (patch) | |
| tree | b34c1220f8f8a5e2d6a0876fb7a5894e8a683bbc | |
| parent | b40e2588707d2b7c44ee91da91872e4f9dc5209b (diff) | |
| download | samba-49ba0a9e20939e4412fcf56ae2aef046a342424d.tar.gz samba-49ba0a9e20939e4412fcf56ae2aef046a342424d.tar.bz2 samba-49ba0a9e20939e4412fcf56ae2aef046a342424d.zip | |
r14626: Only set libdir and mandir to the defaults if we haven't used --libdir
or --mandir to set them already. Till now we overwrrote a setting made
with --libdir or --mandir.
(This used to be commit 94980a15be5eae2820c340d3d33b6c9df7053b24)
| -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 4b883a28ac..a5dc7a483f 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -25,10 +25,10 @@ AC_PREFIX_DEFAULT(/usr/local/samba) rootsbindir="\${SBINDIR}" lockdir="\${VARDIR}/locks" piddir="\${VARDIR}/locks" -mandir="\${prefix}/man" +test "${mandir}" || mandir="\${prefix}/man" logfilebase="\${VARDIR}" privatedir="\${prefix}/private" -libdir="\${prefix}/lib" +test "${libdir}" || libdir="\${prefix}/lib" configdir="\${LIBDIR}" swatdir="\${prefix}/swat" |