git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b40e258
)
r14626: Only set libdir and mandir to the defaults if we haven't used --libdir
author
Lars Müller
<lmuelle@samba.org>
Tue, 21 Mar 2006 16:18:34 +0000
(16:18 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 16:15:40 +0000
(11:15 -0500)
or --mandir to set them already. Till now we overwrrote a setting made
with --libdir or --mandir.
(This used to be commit
94980a15be5eae2820c340d3d33b6c9df7053b24
)
source3/configure.in
patch
|
blob
|
history
diff --git
a/source3/configure.in
b/source3/configure.in
index 4b883a28ac003a7653f6999e47657bdb1a24f98c..a5dc7a483f18e0c1efcfe44ef1a9a3f260599108 100644
(file)
--- 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"