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/library/security/gss@$(PKGVERS)
  set name=pkg.description \
      value="Generic Security Service Application Program Interface, Version 2 - user"
*** 30,53 ****
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Security
  set name=variant.arch value=$(ARCH)
  dir path=usr group=sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
! dir path=usr/lib/$(ARCH64)/gss
  dir path=usr/lib/gss
  dir path=usr/lib/sasl
! dir path=usr/lib/sasl/$(ARCH64)
  dir path=usr/sbin
  dir path=usr/share/man/man1m
  dir path=usr/share/man/man3gss
  dir path=usr/share/man/man3lib
! file path=usr/lib/$(ARCH64)/libgss.so.1
  file path=usr/lib/gss/gsscred_clean group=sys mode=0744
  file path=usr/lib/gss/gssd mode=0555
  file path=usr/lib/libgss.so.1
! file path=usr/lib/sasl/$(ARCH64)/gssapi.so.1
  file path=usr/lib/sasl/gssapi.so.1
  file path=usr/sbin/gsscred group=sys mode=0555
  file path=usr/share/man/man1m/gsscred.1m
  file path=usr/share/man/man1m/gssd.1m
  file path=usr/share/man/man3gss/gss_accept_sec_context.3gss
--- 31,54 ----
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Security
  set name=variant.arch value=$(ARCH)
  dir path=usr group=sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
! $(BUILD64)dir path=usr/lib/$(ARCH64)/gss
  dir path=usr/lib/gss
  dir path=usr/lib/sasl
! $(BUILD64)dir path=usr/lib/sasl/$(ARCH64)
  dir path=usr/sbin
  dir path=usr/share/man/man1m
  dir path=usr/share/man/man3gss
  dir path=usr/share/man/man3lib
! $(BUILD64)file path=usr/lib/$(ARCH64)/libgss.so.1
  file path=usr/lib/gss/gsscred_clean group=sys mode=0744
  file path=usr/lib/gss/gssd mode=0555
  file path=usr/lib/libgss.so.1
! $(BUILD64)file path=usr/lib/sasl/$(ARCH64)/gssapi.so.1
  file path=usr/lib/sasl/gssapi.so.1
  file path=usr/sbin/gsscred group=sys mode=0555
  file path=usr/share/man/man1m/gsscred.1m
  file path=usr/share/man/man1m/gssd.1m
  file path=usr/share/man/man3gss/gss_accept_sec_context.3gss
*** 98,104 ****
      license=usr/src/lib/libgss/THIRDPARTYLICENSE
  license usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE \
      license=usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE
  license usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \
      license=usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE
! link path=usr/lib/$(ARCH64)/libgss.so target=libgss.so.1
  link path=usr/lib/libgss.so target=libgss.so.1
--- 99,105 ----
      license=usr/src/lib/libgss/THIRDPARTYLICENSE
  license usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE \
      license=usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE
  license usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \
      license=usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE
! $(BUILD64)link path=usr/lib/$(ARCH64)/libgss.so target=libgss.so.1
  link path=usr/lib/libgss.so target=libgss.so.1