- generate tascam_fw and tascam_fpga via configure script.

diff --git a/usx2yloader/Makefile.am b/usx2yloader/Makefile.am
index 08357447a416a2c001369bf3b48e75d094011c7b..89e87411428992e8feae2894c8b822631c99b4f0 100644 (file)
--- a/usx2yloader/Makefile.am
+++ b/usx2yloader/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = usx2yloader
 
 usx2yloader_SOURCES = usx2yloader.c
 
-EXTRA_DIST = depcomp tascam_fw.usermap tascam_fw tascam_fpga
+EXTRA_DIST = depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in
 
 hotplug_files = tascam_fw.usermap tascam_fw tascam_fpga
 hotplugdir = /etc/hotplug/usb

diff --git a/usx2yloader/configure.in b/usx2yloader/configure.in
index 151c78af11e0ae98f6373d79a35aad58abcc8615..e91f28a5d0200ad9ecbd34712d68c38730574952 100644 (file)
--- a/usx2yloader/configure.in
+++ b/usx2yloader/configure.in
@@ -8,4 +8,4 @@ AM_PATH_ALSA(1.0.0)
 CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile tascam_fpga tascam_fw)

diff --git a/usx2yloader/tascam_fpga b/usx2yloader/tascam_fpga.in
similarity index 70%
rename from usx2yloader/tascam_fpga
rename to usx2yloader/tascam_fpga.in
index 5249cb89aaf1e70e7da3a2230db026bc43755683..fc9d7b75ce27a4d2771ba125651fa13fd3aafe4d 100644 (file)
--- a/usx2yloader/tascam_fpga
+++ b/usx2yloader/tascam_fpga.in
@@ -1,14 +1,18 @@
 #!/bin/sh
 # load the firmware into Tascam USB devices (FPGA design)
 
-LOADER=/usr/local/bin/usx2yloader
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+
+LOADER=@bindir@/usx2yloader
 
 if [ -x /usr/bin/logger ]; then
        /usr/bin/logger -t $0 "calling $LOADER for $DEVICE"
 fi
 $LOADER
-/usr/local/bin/us428control&
+@bin@/us428control &
 if [ -x /usr/bin/logger ]; then
        /usr/bin/logger -t $0 "leaving"
 fi
 
+exit 0

diff --git a/usx2yloader/tascam_fw b/usx2yloader/tascam_fw.in
similarity index 91%
rename from usx2yloader/tascam_fw
rename to usx2yloader/tascam_fw.in
index b44fa4f188d42e47c38262d90d01acd50788296a..14bbc6c7659c0c634cc0198a05d3f00acc92bcbf 100644 (file)
--- a/usx2yloader/tascam_fw
+++ b/usx2yloader/tascam_fw.in
@@ -2,8 +2,11 @@
 
 # load the firmware into Tascam USB devices
 
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+
 FIRMWARE=
-FIRMWAREDIR=/usr/local/share/alsa/firmware
+FIRMWAREDIR=@datadir@/alsa/firmware/usx2yloader
 FLAGS=
 LOADER=/sbin/fxload
 LOADERFIRMWARE=$FIRMWAREDIR/tascam_loader.ihx
@@ -53,3 +56,5 @@ if [ -x /usr/bin/logger ]; then
        /usr/bin/logger -t $0 "load $FIRMWARE for $PRODUCT to $DEVICE"
 fi
 $LOADER $FLAGS -s $LOADERFIRMWARE -I $FIRMWARE
+
+exit 0