1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/install-beadm.mf
          +++ new/usr/src/pkg/manifests/install-beadm.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  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  # Copyright 2010 Nexenta Systems, Inc. All rights reserved.
  24   24  # Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
       25 +# Copyright 2014 Andrew Stormont.
  25   26  #
  26   27  
  27   28  set name=pkg.fmri value=pkg:/install/beadm@$(PKGVERS)
  28   29  set name=pkg.description value="Boot Environment Management Tool"
  29   30  set name=pkg.summary value="beadm utility"
  30   31  set name=info.classification value=org.opensolaris.category.2008:System/Core
  31   32  set name=variant.arch value=$(ARCH)
  32   33  dir path=sbin group=sys
  33   34  dir path=usr group=sys
  34   35  dir path=usr/include
  35   36  dir path=usr/lib
  36      -dir path=usr/lib/$(ARCH64)
       37 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  37   38  dir path=usr/lib/python2.6
  38   39  dir path=usr/lib/python2.6/vendor-packages
  39   40  dir path=usr/lib/python2.6/vendor-packages/64
  40   41  dir path=usr/lib/python2.6/vendor-packages/beadm
  41   42  dir path=usr/sbin
  42   43  dir path=usr/share
  43   44  dir path=usr/share/man
  44   45  dir path=usr/share/man/man1m
  45   46  file path=sbin/beadm mode=0555
  46   47  file path=usr/include/libbe.h
  47      -file path=usr/lib/$(ARCH64)/libbe.so.1
  48      -file path=usr/lib/$(ARCH64)/llib-lbe.ln
       48 +$(BUILD64)file path=usr/lib/$(ARCH64)/libbe.so.1
       49 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lbe.ln
  49   50  file path=usr/lib/libbe.so.1
  50   51  file path=usr/lib/llib-lbe
  51   52  file path=usr/lib/llib-lbe.ln
  52   53  file path=usr/lib/python2.6/vendor-packages/64/libbe_py.so
  53   54  file path=usr/lib/python2.6/vendor-packages/libbe_py.so
  54   55  file path=usr/share/man/man1m/beadm.1m
  55   56  license cr_Sun license=cr_Sun
  56   57  license lic_CDDL license=lic_CDDL
  57      -link path=usr/lib/$(ARCH64)/libbe.so target=./libbe.so.1
       58 +$(BUILD64)link path=usr/lib/$(ARCH64)/libbe.so target=./libbe.so.1
  58   59  link path=usr/lib/libbe.so target=./libbe.so.1
  59   60  link path=usr/sbin/beadm target=../../sbin/beadm
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX