summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Müller <lmuelle@samba.org>2006-03-07 23:04:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:11:04 -0500
commitef5b36ca8ddd435a479cad539759c765a6cf415e (patch)
treed3594bc0f0d4ece174d2d371adaef4dd95a01d61
parentf7bf439030dddec3355441a833566aafbf89f6b9 (diff)
downloadsamba-ef5b36ca8ddd435a479cad539759c765a6cf415e.tar.gz
samba-ef5b36ca8ddd435a479cad539759c765a6cf415e.tar.bz2
samba-ef5b36ca8ddd435a479cad539759c765a6cf415e.zip
r13997: Prefix $prefix by default even to rootsbindir as we else run in trouble
if we use ./configure --prefix=dir && make install Vendors might use ./configure --with-rootsbindir=/sbin && make DESTDIR=/var/tmp/samba/ install if they use a buildroot. Thanks to Björn Jacke for pointing me at the stderr output of the build farm. (This used to be commit 75c95d149a22eba4a5afedcec7ba5e2a28cccf01)
-rw-r--r--source3/configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 564b035254..967a4ae2fd 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -22,7 +22,7 @@ fi
# ones...
AC_PREFIX_DEFAULT(/usr/local/samba)
-rootsbindir="/sbin"
+rootsbindir="\${prefix}/sbin"
lockdir="\${VARDIR}/locks"
piddir="\${VARDIR}/locks"
mandir="\${prefix}/man"
@@ -66,7 +66,7 @@ AC_ARG_WITH(privatedir,
#################################################
# set root sbin directory location
AC_ARG_WITH(rootsbindir,
-[ --with-rootsbindir=DIR Which directory to use for root sbin (/sbin)],
+[ --with-rootsbindir=DIR Which directory to use for root sbin ($ac_default_prefix/sbin)],
[ case "$withval" in
yes|no)
#