1681 support for BUILD64=# no longer works

@@ -19,10 +19,11 @@
 # CDDL HEADER END
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. 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

@@ -42,21 +43,21 @@
 dir path=lib/svc/manifest/system group=sys
 dir path=lib/svc/method
 dir path=usr group=sys
 dir path=usr/include
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/ndmp
 dir path=usr/sbin
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man4
 file path=lib/svc/manifest/system/ndmp.xml group=sys mode=0444
 file path=lib/svc/method/svc-ndmp mode=0555
 file path=usr/include/libndmp.h
-file path=usr/lib/$(ARCH64)/libndmp.so.1
-file path=usr/lib/$(ARCH64)/llib-lndmp.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/libndmp.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lndmp.ln
 file path=usr/lib/libndmp.so.1
 file path=usr/lib/llib-lndmp
 file path=usr/lib/llib-lndmp.ln
 file path=usr/lib/ndmp/ndmpd mode=0555
 file path=usr/sbin/ndmpadm mode=0555

@@ -73,7 +74,7 @@
     name="Network Data Management Protocol Service (User)"
 license cr_Sun license=cr_Sun
 license lic_OSBL license=lic_OSBL
 license lic_OSBL_preamble license=lic_OSBL_preamble
 license usr/src/cmd/ndmpd/LICENSE license=usr/src/cmd/ndmpd/LICENSE
-link path=usr/lib/$(ARCH64)/libndmp.so target=libndmp.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libndmp.so target=libndmp.so.1
 link path=usr/lib/libndmp.so target=libndmp.so.1