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@$(PKGVERS)
 set name=pkg.description \
     value="Solaris Zones Configuration and Administration"

@@ -41,11 +42,11 @@
 dir path=usr/bin
 dir path=usr/kernel group=sys
 dir path=usr/kernel/drv group=sys
 dir path=usr/kernel/drv/$(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/ipkg group=bin
 dir path=usr/lib/brand/shared group=sys
 dir path=usr/lib/zones
 dir path=usr/sbin

@@ -75,13 +76,13 @@
 file path=lib/svc/method/svc-zonestat mode=0555 \
     variant.opensolaris.zone=global
 file path=usr/bin/zonestat mode=0555
 file path=usr/kernel/drv/$(ARCH64)/zcons group=sys
 $(i386_ONLY)file path=usr/kernel/drv/zcons group=sys
-file path=usr/lib/$(ARCH64)/libbrand.so.1
-file path=usr/lib/$(ARCH64)/libzonecfg.so.1
-file path=usr/lib/$(ARCH64)/libzonestat.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libbrand.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libzonecfg.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libzonestat.so.1
 file path=usr/lib/brand/ipkg/config.xml mode=0444
 file path=usr/lib/brand/ipkg/platform.xml mode=0444
 file path=usr/lib/brand/shared/common.ksh mode=0444
 file path=usr/lib/brand/shared/query mode=0755
 file path=usr/lib/brand/shared/uninstall.ksh mode=0444