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:/network/ipfilter@$(PKGVERS)
 set name=pkg.description value="IP Filter Utilities"
 set name=pkg.summary value="IP Filter utilities"

@@ -41,14 +42,14 @@
 dir path=usr/kernel/drv group=sys
 dir path=usr/kernel/drv/$(ARCH64) group=sys
 dir path=usr/lib
 dir path=usr/lib/ipf
 $(i386_ONLY)dir path=usr/lib/ipf/$(ARCH32) group=sys
-dir path=usr/lib/ipf/$(ARCH64) group=sys
+$(BUILD64)dir path=usr/lib/ipf/$(ARCH64) group=sys
 dir path=usr/sbin
 $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
-dir path=usr/sbin/$(ARCH64)
+$(BUILD64)dir path=usr/sbin/$(ARCH64)
 dir path=usr/share
 dir path=usr/share/ipfilter
 dir path=usr/share/ipfilter/examples
 dir path=usr/share/man
 dir path=usr/share/man/man1m

@@ -65,25 +66,25 @@
 file path=lib/svc/method/ipfilter mode=0555
 file path=usr/kernel/drv/$(ARCH64)/ipf group=sys
 $(i386_ONLY)file path=usr/kernel/drv/ipf group=sys
 file path=usr/kernel/drv/ipf.conf group=sys
 $(i386_ONLY)file path=usr/lib/ipf/$(ARCH32)/ipftest mode=0555
-file path=usr/lib/ipf/$(ARCH64)/ipftest mode=0555
+$(BUILD64)file path=usr/lib/ipf/$(ARCH64)/ipftest mode=0555
 file path=usr/lib/ipf/IPFILTER.LICENCE
 file path=usr/lib/servinfo mode=0555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipf mode=0555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipfs mode=0555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipfstat mode=0555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipmon mode=0555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipnat mode=0555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/ippool mode=0555
-file path=usr/sbin/$(ARCH64)/ipf mode=0555
-file path=usr/sbin/$(ARCH64)/ipfs mode=0555
-file path=usr/sbin/$(ARCH64)/ipfstat mode=0555
-file path=usr/sbin/$(ARCH64)/ipmon mode=0555
-file path=usr/sbin/$(ARCH64)/ipnat mode=0555
-file path=usr/sbin/$(ARCH64)/ippool mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/ipf mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/ipfs mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/ipfstat mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/ipmon mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/ipnat mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/ippool mode=0555
 file path=usr/share/ipfilter/examples/BASIC.NAT
 file path=usr/share/ipfilter/examples/BASIC_1.FW
 file path=usr/share/ipfilter/examples/BASIC_2.FW
 file path=usr/share/ipfilter/examples/example.1
 file path=usr/share/ipfilter/examples/example.10