1681 support for BUILD64=# no longer works

@@ -19,10 +19,11 @@
 # CDDL HEADER END
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2014 Andrew Stormont.
 #
 
 set name=pkg.fmri value=pkg:/system/zones/brand/sn1@$(PKGVERS)
 set name=pkg.description value="Support for the Fake Solaris N-1 Brand"
 set name=pkg.summary value="Fake Solaris N-1 Brand"

@@ -43,23 +44,23 @@
 dir path=usr group=sys
 $(i386_ONLY)dir path=usr/kernel group=sys
 $(i386_ONLY)dir path=usr/kernel/brand group=sys
 $(i386_ONLY)dir path=usr/kernel/brand/$(ARCH64) group=sys
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/brand
 dir path=usr/lib/brand/sn1 group=sys
-dir path=usr/lib/brand/sn1/$(ARCH64)
+$(BUILD64)dir path=usr/lib/brand/sn1/$(ARCH64)
 file path=etc/zones/SUNWsn1.xml mode=0444
 $(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/sn1_brand \
     group=sys mode=0755
 $(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/sn1_brand \
     group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/brand/$(ARCH64)/sn1_brand group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/brand/sn1_brand group=sys mode=0755
-file path=usr/lib/$(ARCH64)/sn1_brand.so.1
-file path=usr/lib/brand/sn1/$(ARCH64)/sn1_librtld_db.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/sn1_brand.so.1
+$(BUILD64)file path=usr/lib/brand/sn1/$(ARCH64)/sn1_librtld_db.so.1
 file path=usr/lib/brand/sn1/config.xml mode=0444
 file path=usr/lib/brand/sn1/platform.xml mode=0444
 file path=usr/lib/brand/sn1/sn1_boot mode=0755
 file path=usr/lib/brand/sn1/sn1_librtld_db.so.1
 file path=usr/lib/sn1_brand.so.1

@@ -67,6 +68,6 @@
     name="Fake Solaris N-1 Brand (Root)"
 legacy pkg=SUNWsn1uint desc="Support for the Fake Solaris N-1 Brand" \
     name="Fake Solaris N-1 Brand (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/brand/sn1/64 target=$(ARCH64)
+$(BUILD64)link path=usr/lib/brand/sn1/64 target=$(ARCH64)