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

@@ -60,11 +61,11 @@
 dir path=usr/kernel/misc group=sys
 dir path=usr/kernel/misc/$(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/man4
 driver name=ncall devlink=type=ddi_pseudo;name=ncall\t\D \

@@ -107,12 +108,12 @@
 file path=usr/kernel/misc/$(ARCH64)/spuni group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/misc/spuni group=sys mode=0755
 file path=usr/lib/libdscfg.so.1
 file path=usr/lib/libnsctl.so.1
 file path=usr/lib/libunistat.so.1
-file path=usr/lib/mdb/kvm/$(ARCH64)/nsctl.so group=sys mode=0555
-file path=usr/lib/mdb/kvm/$(ARCH64)/sdbc.so group=sys mode=0555
+$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/nsctl.so group=sys mode=0555
+$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/sdbc.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/nsctl.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/sdbc.so group=sys mode=0555
 file path=usr/share/man/man1m/dsbitmap.1m
 file path=usr/share/man/man1m/dscfg.1m
 file path=usr/share/man/man1m/dscfgadm.1m