1681 support for BUILD64=# no longer works

*** 20,29 ****
--- 20,30 ----
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2012 Nexenta Systems, Inc. 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
*** 39,60 ****
  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)
  dir path=usr/sbin
  dir path=usr/share/man
  dir path=usr/share/man/man1m
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man4
  file path=etc/smhba.conf group=sys original_name=SUNWsmhba:etc/smhba.conf \
      preserve=true
  file path=usr/include/smhbaapi.h
! file path=usr/lib/$(ARCH64)/libSMHBAAPI.so.1
! file path=usr/lib/$(ARCH64)/libsun_sas.so.1
! file path=usr/lib/$(ARCH64)/llib-lSMHBAAPI.ln
  file path=usr/lib/libSMHBAAPI.so.1
  file path=usr/lib/libsun_sas.so.1
  file path=usr/lib/llib-lSMHBAAPI
  file path=usr/lib/llib-lSMHBAAPI.ln
  file path=usr/sbin/sasinfo mode=0555
--- 40,61 ----
  set name=variant.arch value=$(ARCH)
  dir path=etc group=sys
  dir path=usr group=sys
  dir path=usr/include
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
  dir path=usr/sbin
  dir path=usr/share/man
  dir path=usr/share/man/man1m
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man4
  file path=etc/smhba.conf group=sys original_name=SUNWsmhba:etc/smhba.conf \
      preserve=true
  file path=usr/include/smhbaapi.h
! $(BUILD64)file path=usr/lib/$(ARCH64)/libSMHBAAPI.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/libsun_sas.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-lSMHBAAPI.ln
  file path=usr/lib/libSMHBAAPI.so.1
  file path=usr/lib/libsun_sas.so.1
  file path=usr/lib/llib-lSMHBAAPI
  file path=usr/lib/llib-lSMHBAAPI.ln
  file path=usr/sbin/sasinfo mode=0555
*** 68,79 ****
      name="SM-HBA Libraries and CLI (root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
  license usr/src/lib/smhba/THIRDPARTYLICENSE \
      license=usr/src/lib/smhba/THIRDPARTYLICENSE
! link path=usr/lib/$(ARCH64)/libSMHBAAPI.so target=libSMHBAAPI.so.1
! link path=usr/lib/$(ARCH64)/libsun_sas.so target=libsun_sas.so.1
  link path=usr/lib/libSMHBAAPI.so target=libSMHBAAPI.so.1
  link path=usr/lib/libsun_sas.so target=libsun_sas.so.1
  link path=usr/share/man/man3lib/SMHBA_GetAdapterAttributes.3lib \
      target=libSMHBAAPI.3lib
  link path=usr/share/man/man3lib/SMHBA_GetAdapterPortAttributes.3lib \
--- 69,80 ----
      name="SM-HBA Libraries and CLI (root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
  license usr/src/lib/smhba/THIRDPARTYLICENSE \
      license=usr/src/lib/smhba/THIRDPARTYLICENSE
! $(BUILD64)link path=usr/lib/$(ARCH64)/libSMHBAAPI.so target=libSMHBAAPI.so.1
! $(BUILD64)link path=usr/lib/$(ARCH64)/libsun_sas.so target=libsun_sas.so.1
  link path=usr/lib/libSMHBAAPI.so target=libSMHBAAPI.so.1
  link path=usr/lib/libsun_sas.so target=libsun_sas.so.1
  link path=usr/share/man/man3lib/SMHBA_GetAdapterAttributes.3lib \
      target=libSMHBAAPI.3lib
  link path=usr/share/man/man3lib/SMHBA_GetAdapterPortAttributes.3lib \