1681 support for BUILD64=# no longer works

@@ -22,22 +22,23 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2013 Garrett D'Amore <garrett@damore.org>
+# Copyright 2014 Andrew Stormont.
 #
 
 set name=pkg.fmri value=pkg:/system/header@$(PKGVERS)
 set name=pkg.description \
     value="SunOS C/C++ header files for general development of software"
 set name=pkg.summary value="SunOS Header Files"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/include
-$(i386_ONLY)dir path=usr/include/$(ARCH64)
-$(i386_ONLY)dir path=usr/include/$(ARCH64)/sys
+$(i386_BUILD64)dir path=usr/include/$(ARCH64)
+$(i386_BUILD64)dir path=usr/include/$(ARCH64)/sys
 dir path=usr/include/arpa
 dir path=usr/include/asm
 dir path=usr/include/ast
 dir path=usr/include/bsm
 dir path=usr/include/dat

@@ -186,13 +187,13 @@
 $(i386_ONLY)dir path=usr/share/src/uts/i86xpv
 $(sparc_ONLY)dir path=usr/share/src/uts/sun4u
 $(sparc_ONLY)dir path=usr/share/src/uts/sun4v
 dir path=usr/xpg4
 dir path=usr/xpg4/include
-$(i386_ONLY)file path=usr/include/$(ARCH64)/sys/kdi_regs.h
-$(i386_ONLY)file path=usr/include/$(ARCH64)/sys/privmregs.h
-$(i386_ONLY)file path=usr/include/$(ARCH64)/sys/privregs.h
+$(i386_BUILD64)file path=usr/include/$(ARCH64)/sys/kdi_regs.h
+$(i386_BUILD64)file path=usr/include/$(ARCH64)/sys/privmregs.h
+$(i386_BUILD64)file path=usr/include/$(ARCH64)/sys/privregs.h
 file path=usr/include/aio.h
 file path=usr/include/alloca.h
 file path=usr/include/apptrace.h
 file path=usr/include/apptrace_impl.h
 file path=usr/include/ar.h