1681 support for BUILD64=# no longer works

@@ -20,10 +20,11 @@
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
+# Copyright 2014 Andrew Stormont.
 #
 
 set name=pkg.fmri value=pkg:/package/svr4@$(PKGVERS)
 set name=pkg.description value="Solaris System V Release 4 Packaging Commands"
 set name=pkg.summary value="SVr4 packaging commands"

@@ -35,11 +36,11 @@
 dir path=lib/svc/manifest group=sys
 dir path=lib/svc/manifest/system group=sys
 dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/sadm
 dir path=usr/sadm/install
 dir path=usr/sadm/install/bin
 dir path=usr/sadm/install/scripts
 dir path=usr/sbin

@@ -62,11 +63,11 @@
 file path=usr/bin/pkginfo group=sys mode=0555
 file path=usr/bin/pkgmk mode=0555
 file path=usr/bin/pkgparam group=sys mode=0555
 file path=usr/bin/pkgproto mode=0555
 file path=usr/bin/pkgtrans mode=0555
-file path=usr/lib/$(ARCH64)/libinstzones.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libinstzones.so.1
 file path=usr/lib/libinstzones.so.1
 file path=usr/lib/libpkg.so.1
 file path=usr/sadm/install/bin/pkginstall group=sys mode=0555
 file path=usr/sadm/install/bin/pkgname group=sys mode=0555
 file path=usr/sadm/install/bin/pkgremove group=sys mode=0555