1681 support for BUILD64=# no longer works

@@ -20,10 +20,11 @@
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2014 Andrew Stormont.
 #
 
 #
 # The default for payload-bearing actions in this package is to appear in the
 # global zone only.  See the include file for greater detail, as well as

@@ -50,11 +51,11 @@
 dir path=kernel/strmod group=sys
 dir path=kernel/strmod/$(ARCH64) group=sys
 dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/inet
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man4

@@ -75,11 +76,11 @@
     group=sys
 file path=kernel/drv/$(ARCH64)/nca group=sys
 $(i386_ONLY)file path=kernel/drv/nca group=sys
 file path=kernel/drv/nca.conf group=sys
 file path=usr/bin/ncab2clf mode=0555
-file path=usr/lib/$(ARCH64)/ncad_addr.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/ncad_addr.so.1
 file path=usr/lib/inet/ncaconfd mode=0555
 file path=usr/lib/ncad_addr.so.1
 file path=usr/share/man/man1/nca.1
 file path=usr/share/man/man1/ncab2clf.1
 file path=usr/share/man/man1/ncakmod.1

@@ -103,8 +104,8 @@
 legacy pkg=SUNWncau \
     desc="components to enable the network cache and accelerator" \
     name="Solaris Network Cache and Accelerator (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/$(ARCH64)/ncad_addr.so target=./ncad_addr.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/ncad_addr.so target=./ncad_addr.so.1
 link path=usr/lib/ncad_addr.so target=./ncad_addr.so.1
 link path=usr/share/man/man1/snca.1 target=nca.1