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:/system/tnf@$(PKGVERS)
  set name=pkg.description \
      value="utilities needed to enable probe points, in the kernel and in applications, that can generate Trace Normal Format (TNF) records in a trace file"
*** 31,61 ****
      value=org.opensolaris.category.2008:Development/System
  set name=variant.arch value=$(ARCH)
  dir path=usr group=sys
  dir path=usr/bin
  dir path=usr/bin/$(ARCH32)
! dir path=usr/bin/$(ARCH64)
  dir path=usr/include
  dir path=usr/include/tnf
  dir path=usr/kernel group=sys
  dir path=usr/kernel/drv group=sys
  dir path=usr/kernel/drv/$(ARCH64) group=sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
  dir path=usr/share/man/man1
  dir path=usr/share/man/man3lib
  driver name=tnf perms="tnfctl 0600 root sys" perms="tnfmap 0600 root sys"
  file path=usr/bin/$(ARCH32)/prex mode=0555
  $(i386_ONLY)file path=usr/bin/$(ARCH32)/tnfxtract mode=0555
! file path=usr/bin/$(ARCH64)/prex mode=0555
! file path=usr/bin/$(ARCH64)/tnfxtract mode=0555
  file path=usr/include/tnf/tnfctl.h
  file path=usr/kernel/drv/$(ARCH64)/tnf group=sys
  $(i386_ONLY)file path=usr/kernel/drv/tnf group=sys
  file path=usr/kernel/drv/tnf.conf group=sys
! file path=usr/lib/$(ARCH64)/libtnfctl.so.1
! file path=usr/lib/$(ARCH64)/libtnfprobe.so.1
  file path=usr/lib/libtnfctl.so.1
  file path=usr/lib/libtnfprobe.so.1
  file path=usr/share/man/man1/prex.1
  file path=usr/share/man/man1/tnfxtract.1
  file path=usr/share/man/man3lib/libtnfctl.3lib
--- 32,62 ----
      value=org.opensolaris.category.2008:Development/System
  set name=variant.arch value=$(ARCH)
  dir path=usr group=sys
  dir path=usr/bin
  dir path=usr/bin/$(ARCH32)
! $(BUILD64)dir path=usr/bin/$(ARCH64)
  dir path=usr/include
  dir path=usr/include/tnf
  dir path=usr/kernel group=sys
  dir path=usr/kernel/drv group=sys
  dir path=usr/kernel/drv/$(ARCH64) group=sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
  dir path=usr/share/man/man1
  dir path=usr/share/man/man3lib
  driver name=tnf perms="tnfctl 0600 root sys" perms="tnfmap 0600 root sys"
  file path=usr/bin/$(ARCH32)/prex mode=0555
  $(i386_ONLY)file path=usr/bin/$(ARCH32)/tnfxtract mode=0555
! $(BUILD64)file path=usr/bin/$(ARCH64)/prex mode=0555
! $(BUILD64)file path=usr/bin/$(ARCH64)/tnfxtract mode=0555
  file path=usr/include/tnf/tnfctl.h
  file path=usr/kernel/drv/$(ARCH64)/tnf group=sys
  $(i386_ONLY)file path=usr/kernel/drv/tnf group=sys
  file path=usr/kernel/drv/tnf.conf group=sys
! $(BUILD64)file path=usr/lib/$(ARCH64)/libtnfctl.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/libtnfprobe.so.1
  file path=usr/lib/libtnfctl.so.1
  file path=usr/lib/libtnfprobe.so.1
  file path=usr/share/man/man1/prex.1
  file path=usr/share/man/man1/tnfxtract.1
  file path=usr/share/man/man3lib/libtnfctl.3lib
*** 64,72 ****
  legacy pkg=SUNWtnfc \
      desc="utilities needed to enable probe points, in the kernel and in applications, that can generate Trace Normal Format (TNF) records in a trace file" \
      name="TNF Core Components"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=usr/lib/$(ARCH64)/libtnfctl.so target=libtnfctl.so.1
! link path=usr/lib/$(ARCH64)/libtnfprobe.so target=libtnfprobe.so.1
  link path=usr/lib/libtnfctl.so target=./libtnfctl.so.1
  link path=usr/lib/libtnfprobe.so target=./libtnfprobe.so.1
--- 65,73 ----
  legacy pkg=SUNWtnfc \
      desc="utilities needed to enable probe points, in the kernel and in applications, that can generate Trace Normal Format (TNF) records in a trace file" \
      name="TNF Core Components"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=usr/lib/$(ARCH64)/libtnfctl.so target=libtnfctl.so.1
! $(BUILD64)link path=usr/lib/$(ARCH64)/libtnfprobe.so target=libtnfprobe.so.1
  link path=usr/lib/libtnfctl.so target=./libtnfctl.so.1
  link path=usr/lib/libtnfprobe.so target=./libtnfprobe.so.1