svn commit: r209510 - head

[Andrew Thompson]

On 25 June 2010 04:32, Warner Losh <imp at freebsd.org> wrote:
> Author: imp
> Date: Thu Jun 24 16:32:20 2010
> New Revision: 209510
> URL: http://svn.freebsd.org/changeset/base/209510
>
> Log:
>  Merge from tbemd:
>
>  change the name of the object tree from ${TARGET} to
>  ${TARGET}.${TARGET_ARCH} so we can do both big and little endian
>  builds in the same tree.

This seems to have broken the VCS string in vers.c, does this look ok?

Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh	(revision 212945)
+++ sys/conf/newvers.sh	(working copy)
@@ -91,7 +91,7 @@ case "$d" in
 */sys/*)
 	SRCDIR=${d##*obj}
 	if [ -n "$MACHINE" ]; then
-		SRCDIR=${SRCDIR##/$MACHINE}
+		SRCDIR=${SRCDIR##/$MACHINE.$MACHINE_ARCH}
 	fi
 	SRCDIR=${SRCDIR%%/sys/*}