Revert FIRMWARE_DIR / DECODERS_DIR method for now.

There were several issues with the other method, revert for now.

diff --git a/hardware/asix-sigma/Makefile.am b/hardware/asix-sigma/Makefile.am
index a3cf54e3c71db9663cc512278733be601501c4bb..6359e25fbc11a605f69eb44d23c019f51a9c7017 100644 (file)
--- a/hardware/asix-sigma/Makefile.am
+++ b/hardware/asix-sigma/Makefile.am
@@ -19,6 +19,8 @@
 
 if LA_ASIX_SIGMA
 
+AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+
 # Local lib, this is NOT meant to be installed!
 noinst_LTLIBRARIES = libsigrokhwasixsigma.la
 

diff --git a/hardware/saleae-logic/Makefile.am b/hardware/saleae-logic/Makefile.am
index 120df19159796bdc96899cb53a6399d9deae1ac0..183e7ecb484dd3b10a0e0188c4d52dafc66d96a1 100644 (file)
--- a/hardware/saleae-logic/Makefile.am
+++ b/hardware/saleae-logic/Makefile.am
@@ -19,6 +19,8 @@
 
 if LA_SALEAE_LOGIC
 
+AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+
 # Local lib, this is NOT meant to be installed!
 noinst_LTLIBRARIES = libsigrokhwsaleaelogic.la