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.
 #
 
 #
 # The default for payload-bearing actions in this package is to appear in the
 # global zone only.  See the include file for greater detail, as well as

@@ -48,11 +49,11 @@
 dir path=platform/sun4v/kernel/drv/$(ARCH64) group=sys
 dir path=platform/sun4v/kernel/misc group=sys
 dir path=platform/sun4v/kernel/misc/$(ARCH64) group=sys
 dir path=usr group=sys
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/ldoms
 dir path=usr/lib/rcm
 dir path=usr/lib/rcm/scripts
 dir path=usr/share/man/man1m
 driver name=cnex alias=SUNW,sun4v-channel-devices

@@ -93,12 +94,12 @@
 file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_mem group=sys mode=0755
 file path=platform/sun4v/kernel/misc/$(ARCH64)/ds group=sys mode=0755
 file path=platform/sun4v/kernel/misc/$(ARCH64)/fault_iso group=sys mode=0755
 file path=platform/sun4v/kernel/misc/$(ARCH64)/ldc group=sys mode=0755
 file path=platform/sun4v/kernel/misc/$(ARCH64)/platsvc group=sys mode=0755
-file path=usr/lib/$(ARCH64)/libds.so.1
-file path=usr/lib/$(ARCH64)/libpri.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libds.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libpri.so.1
 file path=usr/lib/ldoms/drd mode=0555
 file path=usr/lib/ldoms/ldmad mode=0555
 file path=usr/lib/ldoms/vntsd mode=0555
 file path=usr/lib/libds.so.1
 file path=usr/lib/libpri.so.1