From: Uwe Hermann <redacted>
Date: Fri, 4 Feb 2011 19:11:17 +0000 (+0100)
Subject: Revert FIRMWARE_DIR / DECODERS_DIR method for now.
X-Git-Tag: libsigrok-0.1.0~347
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0f33365007d72e3f114938a61b9c426b6f5e48c6;p=libsigrok.git

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 a3cf54e3..6359e25f 100644
--- 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 120df191..183e7ecb 100644
--- 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