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/ima/header-ima@$(PKGVERS)
 set name=pkg.description \
     value="SNIA iSCSI Managment API common library for iSCSI adapters"

@@ -32,15 +33,15 @@
 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)
 file path=etc/ima.conf original_name=SUNWimac:etc/ima.conf preserve=true
 file path=usr/include/ima.h
 file path=usr/include/libsun_ima.h
-file path=usr/lib/$(ARCH64)/libima.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libima.so.1
 file path=usr/lib/libima.so.1
 legacy pkg=SUNWimac \
     desc="SNIA iSCSI Managment API common library for iSCSI adapters" \
     name="Solaris IMA Common Library"
 legacy pkg=SUNWimacr \

@@ -48,8 +49,8 @@
     name="Solaris IMA Common Library (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/lib/libima/THIRDPARTYLICENSE \
     license=usr/src/lib/libima/THIRDPARTYLICENSE
-link path=usr/lib/$(ARCH64)/libima.so target=libima.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libima.so target=libima.so.1
 link path=usr/lib/libima.so target=libima.so.1
 depend fmri=system/library/storage/ima type=require