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.
 #
 
 set name=pkg.fmri value=pkg:/service/resource-pools@$(PKGVERS)
 set name=pkg.description value="core software for resource pools"
 set name=pkg.summary value="Resource Pools"

@@ -39,11 +40,11 @@
 dir path=usr/include
 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)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/rcm
 dir path=usr/lib/rcm/modules
 dir path=usr/sbin
 dir path=usr/share
 dir path=usr/share/lib

@@ -66,12 +67,12 @@
 file path=usr/bin/poolstat mode=0555
 file path=usr/include/pool.h
 file path=usr/kernel/drv/$(ARCH64)/pool group=sys
 $(i386_ONLY)file path=usr/kernel/drv/pool group=sys
 file path=usr/kernel/drv/pool.conf group=sys
-file path=usr/lib/$(ARCH64)/libpool.so.1
-file path=usr/lib/$(ARCH64)/llib-lpool.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/libpool.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lpool.ln
 file path=usr/lib/libpool.so.1
 file path=usr/lib/llib-lpool
 file path=usr/lib/llib-lpool.ln
 file path=usr/lib/rcm/modules/SUNW_pool_rcm.so mode=0555
 file path=usr/sbin/pooladm mode=0555

@@ -99,11 +100,11 @@
     name="Resource Pools"
 legacy pkg=SUNWpoolr desc="core software for resource pools (Root)" \
     name="Resource Pools (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/$(ARCH64)/libpool.so target=libpool.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libpool.so target=libpool.so.1
 link path=usr/lib/libpool.so target=./libpool.so.1
 link path=usr/share/man/man3pool/pool_conf_close.3pool \
     target=pool_conf_alloc.3pool
 link path=usr/share/man/man3pool/pool_conf_commit.3pool \
     target=pool_conf_alloc.3pool