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.
 #
 
 set name=pkg.fmri value=pkg:/service/network/slp@$(PKGVERS)
 set name=pkg.description \
     value="Usr filesystem portion of the Service Location Protocol (SLP) framework. Included are C and Java developer libraries and a daemon which can act as a directory agent (DA)."

@@ -39,11 +40,11 @@
 dir path=lib/svc/manifest/network 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/inet
 dir path=usr/share
 dir path=usr/share/lib
 dir path=usr/share/lib/slp
 dir path=usr/share/man

@@ -55,12 +56,12 @@
 file path=etc/inet/slp.conf.example group=sys
 file path=etc/init.d/slpd group=sys mode=0744
 file path=lib/svc/manifest/network/slp.xml group=sys mode=0444
 file path=lib/svc/method/slp mode=0555
 file path=usr/include/slp.h
-file path=usr/lib/$(ARCH64)/libslp.so.1
-file path=usr/lib/$(ARCH64)/llib-lslp.ln
+$(BUILD64)file path=usr/lib/$(ARCH64)/libslp.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lslp.ln
 file path=usr/lib/inet/slpd mode=0555
 file path=usr/lib/libslp.so.1
 file path=usr/lib/llib-lslp
 file path=usr/lib/llib-lslp.ln
 file path=usr/share/lib/slp/slp.jar group=sys

@@ -94,7 +95,7 @@
 legacy pkg=SUNWslpu \
     desc="Usr filesystem portion of the Service Location Protocol (SLP) framework. Included are C and Java developer libraries and a daemon which can act as a directory agent (DA)." \
     name="SLP, (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/$(ARCH64)/libslp.so target=libslp.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/libslp.so target=libslp.so.1
 link path=usr/lib/libslp.so target=libslp.so.1