1681 support for BUILD64=# no longer works

*** 19,28 ****
--- 19,29 ----
  # 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@$(PKGVERS)
  set name=pkg.description \
      value="SNIA iSCSI Managment API plugin library for iSCSI adapters"
*** 31,44 ****
      value="org.opensolaris.category.2008:Applications/Plug-ins and Run-times"
  set name=variant.arch value=$(ARCH)
  dir path=etc group=sys
  dir path=usr group=sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
! file path=usr/lib/$(ARCH64)/libsun_ima.so.1
! file path=usr/lib/$(ARCH64)/llib-lima.ln
! file path=usr/lib/$(ARCH64)/llib-lsun_ima.ln
  file path=usr/lib/libsun_ima.so.1
  file path=usr/lib/llib-lima
  file path=usr/lib/llib-lima.ln
  file path=usr/lib/llib-lsun_ima
  file path=usr/lib/llib-lsun_ima.ln
--- 32,45 ----
      value="org.opensolaris.category.2008:Applications/Plug-ins and Run-times"
  set name=variant.arch value=$(ARCH)
  dir path=etc group=sys
  dir path=usr group=sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
! $(BUILD64)file path=usr/lib/$(ARCH64)/libsun_ima.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-lima.ln
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-lsun_ima.ln
  file path=usr/lib/libsun_ima.so.1
  file path=usr/lib/llib-lima
  file path=usr/lib/llib-lima.ln
  file path=usr/lib/llib-lsun_ima
  file path=usr/lib/llib-lsun_ima.ln
*** 50,56 ****
      name="Solaris IMA Software Initiator Plugin (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)/libsun_ima.so target=libsun_ima.so.1
  link path=usr/lib/libsun_ima.so target=libsun_ima.so.1
--- 51,57 ----
      name="Solaris IMA Software Initiator Plugin (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
! $(BUILD64)link path=usr/lib/$(ARCH64)/libsun_ima.so target=libsun_ima.so.1
  link path=usr/lib/libsun_ima.so target=libsun_ima.so.1