linux-gpib-firmwaredir.patch

   1 --- linux-gpib-4.0.3/usb/agilent_82357a/agilent_82357a.orig     2016-04-09 15:33:10.000000000 +0200
   2 +++ linux-gpib-4.0.3/usb/agilent_82357a/agilent_82357a  2016-07-05 22:01:15.232112298 +0200
   3 @@ -1,7 +1,7 @@
   4  #!/bin/sh
   5
   6  GPIB_CONFIG_OPTIONS="--minor 0"
   7 -DATADIR=/usr/share
   8 +FIRMWAREDIR=/lib/firmware
   9  FXLOAD=fxload
  10  FXLOAD_OPTIONS=
  11
  12 @@ -47,7 +47,7 @@
  13
  14  # 82357a without firmware
  15  957/7/*)
  16 -       FIRMWARE=$DATADIR/usb/agilent_82357a/82357a_fw.hex
  17 +       FIRMWARE=$FIRMWAREDIR/agilent_82357a/82357a_fw.hex
  18         ;;
  19
  20  # 82357b with firmware already loaded
  21 @@ -57,7 +57,7 @@
  22
  23  # 82357b without firmware
  24  957/518/*)
  25 -       FIRMWARE=$DATADIR/usb/agilent_82357a/measat_releaseX1.8.hex
  26 +       FIRMWARE=$FIRMWAREDIR/agilent_82357a/measat_releaseX1.8.hex
  27         FXLOAD_OPTIONS="-t fx2"
  28         ;;
  29
  30 --- linux-gpib-4.0.3/usb/ni_usb_gpib/ni_usb_gpib.orig   2016-04-09 15:33:10.000000000 +0200
  31 +++ linux-gpib-4.0.3/usb/ni_usb_gpib/ni_usb_gpib        2016-07-05 22:01:43.015295116 +0200
  32 @@ -1,7 +1,7 @@
  33  #!/bin/sh
  34
  35  GPIB_CONFIG_OPTIONS="--minor 0"
  36 -DATADIR=/usr/share
  37 +FIRMWAREDIR=/lib/firmware
  38  FXLOAD=fxload
  39  FXLOAD_OPTIONS="-t fx"
  40
  41 @@ -48,8 +48,8 @@
  42
  43  # ni-usb-b or kusb-488 without firmware
  44  3923/702b/* | 3923/713b/*)
  45 -       FIRMWARE=$DATADIR/usb/ni_usb_gpib/niusbb_firmware.hex
  46 -       SS_LOADER=$DATADIR/usb/ni_usb_gpib/niusbb_loader.hex
  47 +       FIRMWARE=$FIRMWAREDIR/ni_usb_gpib/niusbb_firmware.hex
  48 +       SS_LOADER=$FIRMWAREDIR/ni_usb_gpib/niusbb_loader.hex
  49         ;;
  50
  51  # ni-usb-hs