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.
 #
 
 set name=pkg.fmri \
     value=pkg:/system/library/storage/fibre-channel/hbaapi@$(PKGVERS)
 set name=pkg.description \

@@ -33,16 +34,16 @@
 set name=variant.arch value=$(ARCH)
 dir path=etc group=sys
 dir path=usr group=sys
 dir path=usr/include
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/share/man
 dir path=usr/share/man/man4
 file path=etc/hba.conf original_name=SUNWcfcl:etc/hba.conf preserve=true
 file path=usr/include/hbaapi.h
-file path=usr/lib/$(ARCH64)/libHBAAPI.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libHBAAPI.so.1
 file path=usr/lib/libHBAAPI.so.1
 file path=usr/share/man/man4/hba.conf.4
 legacy pkg=SUNWcfcl \
     desc="Common Fibre Channel HBA API Library based on the T11 FC-MI specification" \
     name="Common Fibre Channel HBA API Library (Usr)"

@@ -51,8 +52,8 @@
     name="Common Fibre Channel HBA API Library (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/lib/hbaapi/THIRDPARTYLICENSE \
     license=usr/src/lib/hbaapi/THIRDPARTYLICENSE
-link path=usr/lib/$(ARCH64)/libHBAAPI.so target=libHBAAPI.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libHBAAPI.so target=libHBAAPI.so.1
 link path=usr/lib/libHBAAPI.so target=libHBAAPI.so.1
 depend fmri=system/library/storage/fibre-channel/libsun_fc type=require