1681 support for BUILD64=# no longer works

@@ -20,10 +20,11 @@
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2014 Andrew Stormont.
 #
 
 set name=pkg.fmri value=pkg:/network/iscsi/target@$(PKGVERS)
 set name=pkg.description value="Sun iSCSI COMSTAR Port Provider"
 set name=pkg.summary value="Sun iSCSI COMSTAR Port Provider"

@@ -43,11 +44,11 @@
 dir path=usr group=sys
 dir path=usr/include
 dir path=usr/include/sys
 dir path=usr/include/sys/iscsit
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/sbin
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man3iscsit
 dir path=usr/share/man/man3lib
 driver name=iscsit perms="* 0600 root sys"

@@ -58,12 +59,12 @@
     variant.opensolaris.zone=global
 file path=lib/svc/method/iscsi-target mode=0555 \
     variant.opensolaris.zone=global
 file path=usr/include/libiscsit.h
 file path=usr/include/sys/iscsit/iscsit_common.h
-file path=usr/lib/$(ARCH64)/libiscsit.so.1
-file path=usr/lib/$(ARCH64)/llib-liscsit.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/libiscsit.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-liscsit.ln
 file path=usr/lib/libiscsit.so.1
 file path=usr/lib/llib-liscsit
 file path=usr/lib/llib-liscsit.ln
 file path=usr/sbin/itadm mode=0555
 file path=usr/share/man/man1m/itadm.1m

@@ -77,11 +78,11 @@
     name="Sun iSCSI COMSTAR Port Provider (root)"
 legacy pkg=SUNWiscsitu desc="Sun iSCSI COMSTAR Port Provider" \
     name="Sun iSCSI COMSTAR Port Provider"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/$(ARCH64)/libiscsit.so target=libiscsit.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libiscsit.so target=libiscsit.so.1
 link path=usr/lib/libiscsit.so target=libiscsit.so.1
 link path=usr/share/man/man3iscsit/it_config_commit.3iscsit \
     target=it_config_load.3iscsit
 link path=usr/share/man/man3iscsit/it_config_free.3iscsit \
     target=it_config_load.3iscsit