Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh	(revision 208414)
+++ sys/conf/newvers.sh	(working copy)
@@ -89,13 +89,13 @@
 
 case "$d" in
 */sys/*)
-	SRCDIR=${d##*obj}
+	SRCDIR=${d##*${MAKEOBJDIRPREFIX:-/usr/obj}}
 	if [ -n "$MACHINE" ]; then
 		SRCDIR=${SRCDIR##/$MACHINE}
 	fi
 	SRCDIR=${SRCDIR%%/sys/*}
 
-	for dir in /bin /usr/bin /usr/local/bin; do
+	for dir in /bin /usr/bin ${LOCALBASE:-/usr/local}/bin; do
 		if [ -d "${SRCDIR}/sys/.svn" -a -x "${dir}/svnversion" ] ; then
 			svnversion=${dir}/svnversion
 			break