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

@@ -58,11 +59,11 @@
 dir path=usr/kernel/drv group=sys
 dir path=usr/kernel/drv/$(ARCH64) group=sys
 dir path=usr/lib
 dir path=usr/lib/mdb group=sys
 dir path=usr/lib/mdb/kvm group=sys
-dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
+$(BUILD64)dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
 dir path=usr/sbin
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man7d
 driver name=ii devlink=type=ddi_pseudo;name=ii\t\D perms="* 0666 root sys" \

@@ -79,11 +80,11 @@
 file path=usr/cluster/sbin/ii mode=0744
 file path=usr/kernel/drv/$(ARCH64)/ii group=sys
 $(i386_ONLY)file path=usr/kernel/drv/ii group=sys
 file path=usr/kernel/drv/ii.conf group=sys \
     original_name=SUNWii:usr/kernel/drv/ii.conf preserve=true
-file path=usr/lib/mdb/kvm/$(ARCH64)/ii.so group=sys mode=0555
+$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/ii.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/ii.so group=sys mode=0555
 file path=usr/share/man/man1m/iiadm.1m
 file path=usr/share/man/man1m/iicpbmp.1m
 file path=usr/share/man/man1m/iicpshd.1m
 file path=usr/share/man/man7d/ii.7d