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:/system/remote-shared-memory@$(PKGVERS)
 set name=pkg.description value="Remote Shared Memory API Library, Driver"
 set name=pkg.summary value="Remote Shared Memory"

@@ -32,19 +33,19 @@
 dir path=usr group=sys
 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/share/man
 dir path=usr/share/man/man3lib
 dir path=usr/share/man/man3rsm
 driver name=rsm perms="* 0666 root sys"
 file path=usr/kernel/drv/$(ARCH64)/rsm group=sys
 $(i386_ONLY)file path=usr/kernel/drv/rsm group=sys
 file path=usr/kernel/drv/rsm.conf group=sys
-file path=usr/lib/$(ARCH64)/librsm.so.2
+$(BUILD64)file path=usr/lib/$(ARCH64)/librsm.so.2
 file path=usr/lib/librsm.so.2
 file path=usr/share/man/man3lib/librsm.3lib
 file path=usr/share/man/man3rsm/rsm_create_localmemory_handle.3rsm
 file path=usr/share/man/man3rsm/rsm_get_controller.3rsm
 file path=usr/share/man/man3rsm/rsm_get_interconnect_topology.3rsm

@@ -64,11 +65,11 @@
 file path=usr/share/man/man3rsm/rsm_memseg_import_set_mode.3rsm
 legacy pkg=SUNWrsm desc="Remote Shared Memory API Library, Driver" \
     name="Remote Shared Memory"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/$(ARCH64)/librsm.so target=librsm.so.2
+$(BUILD64)link path=usr/lib/$(ARCH64)/librsm.so target=librsm.so.2
 link path=usr/lib/librsm.so target=librsm.so.2
 link path=usr/share/man/man3rsm/rsm_free_interconnect_topology.3rsm \
     target=rsm_get_interconnect_topology.3rsm
 link path=usr/share/man/man3rsm/rsm_free_localmemory_handle.3rsm \
     target=rsm_create_localmemory_handle.3rsm