1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/system-zones-internal.mf
          +++ new/usr/src/pkg/manifests/system-zones-internal.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each

  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2014 Andrew Stormont.
  24   25  #
  25   26  
  26   27  set name=pkg.fmri value=pkg:/system/zones/internal@$(PKGVERS)
  27   28  set name=pkg.description value="Solaris Zones internal files"
  28   29  set name=pkg.summary value="Solaris Zones Internal Files"
  29   30  set name=info.classification \
  30   31      value=org.opensolaris.category.2008:Development/System
  31   32  set name=variant.arch value=$(ARCH)
  32   33  dir path=usr group=sys
  33   34  dir path=usr/include
  34   35  dir path=usr/lib
  35      -dir path=usr/lib/$(ARCH64)
       36 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  36   37  file path=usr/include/libbrand.h
  37   38  file path=usr/include/libuutil.h
  38   39  file path=usr/include/libzonecfg.h
  39   40  file path=usr/include/zonestat_impl.h
  40      -file path=usr/lib/$(ARCH64)/llib-lbrand.ln
  41      -file path=usr/lib/$(ARCH64)/llib-lzonecfg.ln
  42      -file path=usr/lib/$(ARCH64)/llib-lzonestat.ln
       41 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lbrand.ln
       42 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lzonecfg.ln
       43 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lzonestat.ln
  43   44  file path=usr/lib/llib-lbrand
  44   45  file path=usr/lib/llib-lbrand.ln
  45   46  file path=usr/lib/llib-lzonecfg
  46   47  file path=usr/lib/llib-lzonecfg.ln
  47   48  file path=usr/lib/llib-lzonestat
  48   49  file path=usr/lib/llib-lzonestat.ln
  49   50  legacy pkg=SUNWzoneint desc="Solaris Zones internal files" \
  50   51      name="Solaris Zones Internal Files" version=11.11,REV=2009.10.13
  51   52  license cr_Sun license=cr_Sun
  52   53  license lic_CDDL license=lic_CDDL
  53      -link path=usr/lib/$(ARCH64)/libbrand.so target=./libbrand.so.1
  54      -link path=usr/lib/$(ARCH64)/libzonecfg.so target=./libzonecfg.so.1
  55      -link path=usr/lib/$(ARCH64)/libzonestat.so target=./libzonestat.so.1
       54 +$(BUILD64)link path=usr/lib/$(ARCH64)/libbrand.so target=./libbrand.so.1
       55 +$(BUILD64)link path=usr/lib/$(ARCH64)/libzonecfg.so target=./libzonecfg.so.1
       56 +$(BUILD64)link path=usr/lib/$(ARCH64)/libzonestat.so target=./libzonestat.so.1
  56   57  link path=usr/lib/libbrand.so target=./libbrand.so.1
  57   58  link path=usr/lib/libzonecfg.so target=./libzonecfg.so.1
  58   59  link path=usr/lib/libzonestat.so target=./libzonestat.so.1
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX