svn commit: samba r13997 - branches/SAMBA_3_0/source trunk/source

lmuelle at samba.org lmuelle at samba.org
Tue Mar 7 23:04:09 GMT 2006


Author: lmuelle
Date: 2006-03-07 23:04:08 +0000 (Tue, 07 Mar 2006)
New Revision: 13997

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13997

Log:
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?\195?\182rn Jacke for pointing me at the stderr output of the build
farm.

Modified:
   branches/SAMBA_3_0/source/configure.in
   trunk/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2006-03-07 21:16:35 UTC (rev 13996)
+++ branches/SAMBA_3_0/source/configure.in	2006-03-07 23:04:08 UTC (rev 13997)
@@ -22,7 +22,7 @@
 # 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 @@
 #################################################
 # 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)
   #

Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2006-03-07 21:16:35 UTC (rev 13996)
+++ trunk/source/configure.in	2006-03-07 23:04:08 UTC (rev 13997)
@@ -22,7 +22,7 @@
 # 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 @@
 #################################################
 # 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)
   #



More information about the samba-cvs mailing list