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.
  #
  
  set name=pkg.fmri value=pkg:/system/library/storage/libmpapi@$(PKGVERS)
  set name=pkg.description \
      value="Common Library based on SNIA MP API specification"
*** 31,50 ****
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Libraries
  set name=variant.arch value=$(ARCH)
  dir path=etc group=sys variant.opensolaris.zone=global
  dir path=lib variant.opensolaris.zone=global
! dir path=lib/$(ARCH64) variant.opensolaris.zone=global
  dir path=usr group=sys
  dir path=usr/include
  dir path=usr/share/man
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man3mpapi
  dir path=usr/share/man/man4
  file path=etc/mpapi.conf original_name=SUNWmpapi:etc/mpapi.conf preserve=true
! file path=lib/$(ARCH64)/libMPAPI.so.1 variant.opensolaris.zone=global
! file path=lib/$(ARCH64)/llib-lMPAPI.ln variant.opensolaris.zone=global
  file path=lib/libMPAPI.so.1 variant.opensolaris.zone=global
  file path=lib/llib-lMPAPI variant.opensolaris.zone=global
  file path=lib/llib-lMPAPI.ln variant.opensolaris.zone=global
  file path=usr/include/mpapi-sun.h
  file path=usr/include/mpapi.h
--- 32,53 ----
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Libraries
  set name=variant.arch value=$(ARCH)
  dir path=etc group=sys variant.opensolaris.zone=global
  dir path=lib variant.opensolaris.zone=global
! $(BUILD64)dir path=lib/$(ARCH64) variant.opensolaris.zone=global
  dir path=usr group=sys
  dir path=usr/include
  dir path=usr/share/man
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man3mpapi
  dir path=usr/share/man/man4
  file path=etc/mpapi.conf original_name=SUNWmpapi:etc/mpapi.conf preserve=true
! $(BUILD64)file path=lib/$(ARCH64)/libMPAPI.so.1 \
!     variant.opensolaris.zone=global
! $(BUILD64)file path=lib/$(ARCH64)/llib-lMPAPI.ln \
!     variant.opensolaris.zone=global
  file path=lib/libMPAPI.so.1 variant.opensolaris.zone=global
  file path=lib/llib-lMPAPI variant.opensolaris.zone=global
  file path=lib/llib-lMPAPI.ln variant.opensolaris.zone=global
  file path=usr/include/mpapi-sun.h
  file path=usr/include/mpapi.h
*** 104,113 ****
      name="SNIA Multipath Management API Common Library (Root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
  license usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE \
      license=usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE
! link path=lib/$(ARCH64)/libMPAPI.so target=libMPAPI.so.1 \
      variant.opensolaris.zone=global
  link path=lib/libMPAPI.so target=libMPAPI.so.1 variant.opensolaris.zone=global
  link path=usr/share/man/man3lib/libmpapi.3lib target=libMPAPI.3lib
  depend fmri=system/library/storage/libmpscsi_vhci type=require
--- 107,116 ----
      name="SNIA Multipath Management API Common Library (Root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
  license usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE \
      license=usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE
! $(BUILD64)link path=lib/$(ARCH64)/libMPAPI.so target=libMPAPI.so.1 \
      variant.opensolaris.zone=global
  link path=lib/libMPAPI.so target=libMPAPI.so.1 variant.opensolaris.zone=global
  link path=usr/share/man/man3lib/libmpapi.3lib target=libMPAPI.3lib
  depend fmri=system/library/storage/libmpscsi_vhci type=require