1681 support for BUILD64=# no longer works

*** 20,29 ****
--- 20,30 ----
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2013 Garrett D'Amore <garrett@damore.org>
+ # Copyright 2014 Andrew Stormont.
  #
  
  set name=pkg.fmri value=pkg:/service/storage/removable-media@$(PKGVERS)
  set name=pkg.description value="Storage media management library"
  set name=pkg.summary value="Storage media management library"
*** 35,57 ****
  dir path=lib/svc/manifest group=sys
  dir path=lib/svc/manifest/network group=sys
  dir path=lib/svc/manifest/network/rpc group=sys
  dir path=usr group=sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/smedia
! dir path=usr/lib/smedia/$(ARCH64)
  dir path=usr/share/man/man1m
  file path=lib/svc/manifest/network/rpc/smserver.xml group=sys mode=0444
! file path=usr/lib/$(ARCH64)/libsmedia.so.1
! file path=usr/lib/$(ARCH64)/llib-lsmedia.ln
  file path=usr/lib/libsmedia.so.1
  file path=usr/lib/llib-lsmedia
  file path=usr/lib/llib-lsmedia.ln
! file path=usr/lib/smedia/$(ARCH64)/sm_blkdev.so.1 mode=0555
! file path=usr/lib/smedia/$(ARCH64)/sm_fd.so.1 mode=0555
! file path=usr/lib/smedia/$(ARCH64)/sm_scsi.so.1 mode=0555
  file path=usr/lib/smedia/rpc.smserverd mode=0555
  file path=usr/lib/smedia/sm_blkdev.so.1 mode=0555
  file path=usr/lib/smedia/sm_fd.so.1 mode=0555
  file path=usr/lib/smedia/sm_scsi.so.1 mode=0555
  file path=usr/share/man/man1m/rpc.smserverd.1m
--- 36,58 ----
  dir path=lib/svc/manifest group=sys
  dir path=lib/svc/manifest/network group=sys
  dir path=lib/svc/manifest/network/rpc group=sys
  dir path=usr group=sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/smedia
! $(BUILD64)dir path=usr/lib/smedia/$(ARCH64)
  dir path=usr/share/man/man1m
  file path=lib/svc/manifest/network/rpc/smserver.xml group=sys mode=0444
! $(BUILD64)file path=usr/lib/$(ARCH64)/libsmedia.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-lsmedia.ln
  file path=usr/lib/libsmedia.so.1
  file path=usr/lib/llib-lsmedia
  file path=usr/lib/llib-lsmedia.ln
! $(BUILD64)file path=usr/lib/smedia/$(ARCH64)/sm_blkdev.so.1 mode=0555
! $(BUILD64)file path=usr/lib/smedia/$(ARCH64)/sm_fd.so.1 mode=0555
! $(BUILD64)file path=usr/lib/smedia/$(ARCH64)/sm_scsi.so.1 mode=0555
  file path=usr/lib/smedia/rpc.smserverd mode=0555
  file path=usr/lib/smedia/sm_blkdev.so.1 mode=0555
  file path=usr/lib/smedia/sm_fd.so.1 mode=0555
  file path=usr/lib/smedia/sm_scsi.so.1 mode=0555
  file path=usr/share/man/man1m/rpc.smserverd.1m
*** 59,65 ****
      name="Storage media management library"
  legacy pkg=SUNWsmediar desc="Storage media management library (Root)" \
      name="Storage media management library (Root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=usr/lib/$(ARCH64)/libsmedia.so target=./libsmedia.so.1
  link path=usr/lib/libsmedia.so target=./libsmedia.so.1
--- 60,66 ----
      name="Storage media management library"
  legacy pkg=SUNWsmediar desc="Storage media management library (Root)" \
      name="Storage media management library (Root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=usr/lib/$(ARCH64)/libsmedia.so target=./libsmedia.so.1
  link path=usr/lib/libsmedia.so target=./libsmedia.so.1