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

@@ -37,21 +38,21 @@
 set name=variant.arch value=$(ARCH)
 dir path=etc group=sys
 dir path=etc/dat 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/sbin
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man3dat
 dir path=usr/share/man/man3lib
 dir path=usr/share/man/man4
 file path=etc/dat/dat.conf group=sys original_name=SUNWudapl:etc/dat/dat.conf \
     preserve=true
-file path=usr/lib/$(ARCH64)/libdat.so.1
-file path=usr/lib/$(ARCH64)/llib-ldat.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/libdat.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-ldat.ln
 file path=usr/lib/libdat.so.1
 file path=usr/lib/llib-ldat
 file path=usr/lib/llib-ldat.ln
 file path=usr/sbin/datadm mode=0555
 file path=usr/share/man/man1m/datadm.1m

@@ -134,7 +135,7 @@
     name="Sun User Direct Access Programming Library (Root)"
 legacy pkg=SUNWudaplu desc="Sun DAT registry library and datadm" \
     name="Sun User Direct Access Programming Library (User)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/$(ARCH64)/libdat.so target=libdat.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libdat.so target=libdat.so.1
 link path=usr/lib/libdat.so target=libdat.so.1