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 e6d0710771136a38e1c3687abf7d7f9cf334715f..6556df87826371ff8c93de005bec6dec64af67f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ lib_LTLIBRARIES = libsigrokdecode.la
 
 libsigrokdecode_la_SOURCES = decode.c
 
 
 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)
 
 libsigrokdecode_la_LDFLAGS = $(SIGROKDECODE_LT_LDFLAGS) \
                             $(LDFLAGS_PYTHON)
 

diff --git a/decode.c b/decode.c
index da8624a4a40f125784398c64da9ca7a9f1dd45b0..6acbd10455f48da6dfb00516e4c94a3f3eb6ebb8 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
 #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
 
 /* Re-define some string functions for Python >= 3.0. */
 #if PY_VERSION_HEX >= 0x03000000