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.
  #
  
  #
  # 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
*** 36,50 ****
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Hardware
  set name=variant.arch value=$(ARCH)
  dir path=etc group=sys
  dir path=lib
! dir path=lib/$(ARCH64)
! file path=lib/$(ARCH64)/libmpscsi_vhci.so.1
  file path=lib/libmpscsi_vhci.so.1
  legacy pkg=SUNWmpsvplr \
      desc="SNIA MP API plugin library for the scsi_vhci driver (Root)" \
      name="Sun MP API library for the scsi_vhci driver (Root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=lib/$(ARCH64)/libmpscsi_vhci.so target=libmpscsi_vhci.so.1
  link path=lib/libmpscsi_vhci.so target=libmpscsi_vhci.so.1
--- 37,51 ----
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Hardware
  set name=variant.arch value=$(ARCH)
  dir path=etc group=sys
  dir path=lib
! $(BUILD64)dir path=lib/$(ARCH64)
! $(BUILD64)file path=lib/$(ARCH64)/libmpscsi_vhci.so.1
  file path=lib/libmpscsi_vhci.so.1
  legacy pkg=SUNWmpsvplr \
      desc="SNIA MP API plugin library for the scsi_vhci driver (Root)" \
      name="Sun MP API library for the scsi_vhci driver (Root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=lib/$(ARCH64)/libmpscsi_vhci.so target=libmpscsi_vhci.so.1
  link path=lib/libmpscsi_vhci.so target=libmpscsi_vhci.so.1