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:/system/library/storage/scsi-plugins@$(PKGVERS)
 set name=pkg.description value="Vendor specific SCSI and SES plugins"
 set name=pkg.summary value="SCSI/SES plugins"

@@ -33,26 +34,31 @@
 dir path=usr/lib
 dir path=usr/lib/scsi
 dir path=usr/lib/scsi/plugins
 dir path=usr/lib/scsi/plugins/ses
 dir path=usr/lib/scsi/plugins/ses/vendor
-dir path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)
-file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/LSILOGIC-SASX28-A.0.so
-file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4400.so
-file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4500.so
-file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN.so
+$(BUILD64)dir path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)
+$(BUILD64)file \
+    path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/LSILOGIC-SASX28-A.0.so
+$(BUILD64)file \
+    path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4400.so
+$(BUILD64)file \
+    path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4500.so
+$(BUILD64)file path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN.so
 file path=usr/lib/scsi/plugins/ses/vendor/LSILOGIC-SASX28-A.0.so
 file path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4400.so
 file path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4500.so
 file path=usr/lib/scsi/plugins/ses/vendor/SUN.so
 legacy pkg=SUNWscsip desc="Vendor specific SCSI and SES plugins" \
     name="SCSI/SES plugins"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/LSILOGIC-SASX28-A.1.so \
+$(BUILD64)link \
+    path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/LSILOGIC-SASX28-A.1.so \
     target=LSILOGIC-SASX28-A.0.so
-link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4200.so \
+$(BUILD64)link \
+    path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4200.so \
     target=SUN-Storage-J4400.so
 link path=usr/lib/scsi/plugins/ses/vendor/LSILOGIC-SASX28-A.1.so \
     target=LSILOGIC-SASX28-A.0.so
 link path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4200.so \
     target=SUN-Storage-J4400.so