From: Uwe Hermann <redacted>
Date: Sun, 23 Jan 2011 23:24:27 +0000 (+0100)
Subject: configure.ac: Fix firmware/decoders dir variables.
X-Git-Tag: libsigrokdecode-0.1.0~306
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d842aebec31fd21fe0803cb9504ded698f6c1457;p=libsigrokdecode.git

configure.ac: Fix firmware/decoders dir variables.

FIRMWARE_DIR and DECODERS_DIR as defined in config.h need some magic applied
to resolve the $prefix/$data variable to an absolute path.
---

diff --git a/Makefile.am b/Makefile.am
index e6d0710..6556df8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ lib_LTLIBRARIES = libsigrokdecode.la
 
 libsigrokdecode_la_SOURCES = decode.c
 
-libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
-			      -DDECODERS_DIR='"$(DECODERS_DIR)"'
+libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON)
 libsigrokdecode_la_LDFLAGS = $(SIGROKDECODE_LT_LDFLAGS) \
 			     $(LDFLAGS_PYTHON)
 
diff --git a/decode.c b/decode.c
index da8624a..6acbd10 100644
--- a/decode.c
+++ b/decode.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
+#include <config.h>
 
 /* Re-define some string functions for Python >= 3.0. */
 #if PY_VERSION_HEX >= 0x03000000