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:/service/storage/fibre-channel/fc-fabric@$(PKGVERS)
  set name=pkg.description value="Provides the fp plug-in library of libcfgadm."
*** 38,58 ****
      variant.opensolaris.zone=global
  dir path=lib/svc/method variant.opensolaris.zone=global
  dir path=usr group=sys
  dir path=usr/lib
  dir path=usr/lib/cfgadm
! dir path=usr/lib/cfgadm/$(ARCH64)
  file path=lib/svc/manifest/system/device/devices-fc-fabric.xml group=sys \
      mode=0444 variant.opensolaris.zone=global
  file path=lib/svc/method/fc-fabric mode=0555 variant.opensolaris.zone=global
! file path=usr/lib/cfgadm/$(ARCH64)/fp.so.1
  file path=usr/lib/cfgadm/fp.so.1
  legacy pkg=SUNWcfpl desc="Provides the fp plug-in library of libcfgadm." \
      name="fp cfgadm plug-in library"
  legacy pkg=SUNWcfplr \
      desc="Provides support for fp plug-in library of libcfgadm." \
      name="fp cfgadm plug-in library (root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=usr/lib/cfgadm/$(ARCH64)/fp.so target=fp.so.1
  link path=usr/lib/cfgadm/fp.so target=fp.so.1
  depend fmri=system/storage/luxadm type=require
--- 39,59 ----
      variant.opensolaris.zone=global
  dir path=lib/svc/method variant.opensolaris.zone=global
  dir path=usr group=sys
  dir path=usr/lib
  dir path=usr/lib/cfgadm
! $(BUILD64)dir path=usr/lib/cfgadm/$(ARCH64)
  file path=lib/svc/manifest/system/device/devices-fc-fabric.xml group=sys \
      mode=0444 variant.opensolaris.zone=global
  file path=lib/svc/method/fc-fabric mode=0555 variant.opensolaris.zone=global
! $(BUILD64)file path=usr/lib/cfgadm/$(ARCH64)/fp.so.1
  file path=usr/lib/cfgadm/fp.so.1
  legacy pkg=SUNWcfpl desc="Provides the fp plug-in library of libcfgadm." \
      name="fp cfgadm plug-in library"
  legacy pkg=SUNWcfplr \
      desc="Provides support for fp plug-in library of libcfgadm." \
      name="fp cfgadm plug-in library (root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=usr/lib/cfgadm/$(ARCH64)/fp.so target=fp.so.1
  link path=usr/lib/cfgadm/fp.so target=fp.so.1
  depend fmri=system/storage/luxadm type=require