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:/service/picl@$(PKGVERS)
  set name=pkg.description \
      value="PICL Daemon, Libraries, prtpicl client and plug-in modules"
*** 33,43 ****
  dir path=lib variant.opensolaris.zone=global
  dir path=lib/svc variant.opensolaris.zone=global
  dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global
  dir path=usr group=sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/picl group=sys
  dir path=usr/lib/picl/plugins group=sys
  dir path=usr/lib/sysevent
  dir path=usr/lib/sysevent/modules
  $(sparc_ONLY)dir path=usr/platform group=sys
--- 34,44 ----
  dir path=lib variant.opensolaris.zone=global
  dir path=lib/svc variant.opensolaris.zone=global
  dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global
  dir path=usr group=sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/picl group=sys
  dir path=usr/lib/picl/plugins group=sys
  dir path=usr/lib/sysevent
  dir path=usr/lib/sysevent/modules
  $(sparc_ONLY)dir path=usr/platform group=sys
*** 152,163 ****
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man3picl
  dir path=usr/share/man/man3picltree
  file path=lib/svc/manifest/system/picl.xml group=sys mode=0444 \
      variant.opensolaris.zone=global
! file path=usr/lib/$(ARCH64)/libpicl.so.1
! file path=usr/lib/$(ARCH64)/llib-lpicl.ln
  file path=usr/lib/libpicl.so.1
  file path=usr/lib/libpicld_pluginutil.so.1
  file path=usr/lib/libpicltree.so.1
  file path=usr/lib/llib-lpicl
  file path=usr/lib/llib-lpicl.ln
--- 153,164 ----
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man3picl
  dir path=usr/share/man/man3picltree
  file path=lib/svc/manifest/system/picl.xml group=sys mode=0444 \
      variant.opensolaris.zone=global
! $(BUILD64)file path=usr/lib/$(ARCH64)/libpicl.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-lpicl.ln
  file path=usr/lib/libpicl.so.1
  file path=usr/lib/libpicld_pluginutil.so.1
  file path=usr/lib/libpicltree.so.1
  file path=usr/lib/llib-lpicl
  file path=usr/lib/llib-lpicl.ln
*** 705,715 ****
  legacy pkg=SUNWpiclu \
      desc="PICL Daemon, Libraries, prtpicl client and plug-in modules" \
      name="PICL Libraries, and Plugin Modules (Usr)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=usr/lib/$(ARCH64)/libpicl.so target=./libpicl.so.1
  link path=usr/lib/libpicl.so target=./libpicl.so.1
  link path=usr/lib/libpicld_pluginutil.so target=./libpicld_pluginutil.so.1
  link path=usr/lib/libpicltree.so target=./libpicltree.so.1
  link path=usr/lib/picl/plugins/libpicldevtree.so target=./libpicldevtree.so.1
  link path=usr/lib/picl/plugins/libpiclevent.so target=./libpiclevent.so.1
--- 706,716 ----
  legacy pkg=SUNWpiclu \
      desc="PICL Daemon, Libraries, prtpicl client and plug-in modules" \
      name="PICL Libraries, and Plugin Modules (Usr)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=usr/lib/$(ARCH64)/libpicl.so target=./libpicl.so.1
  link path=usr/lib/libpicl.so target=./libpicl.so.1
  link path=usr/lib/libpicld_pluginutil.so target=./libpicld_pluginutil.so.1
  link path=usr/lib/libpicltree.so target=./libpicltree.so.1
  link path=usr/lib/picl/plugins/libpicldevtree.so target=./libpicldevtree.so.1
  link path=usr/lib/picl/plugins/libpiclevent.so target=./libpiclevent.so.1