diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2011-01-24 00:24:27 +0100 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2011-01-24 00:28:55 +0100 |
| commit | d842aebec31fd21fe0803cb9504ded698f6c1457 (patch) | |
| tree | 3ce41681eb081cf8a5337dd90beade4d2767fa83 | |
| parent | 7492a27a7873120d28e4cabf3abad28204ff8844 (diff) | |
| download | libsigrokdecode-d842aebec31fd21fe0803cb9504ded698f6c1457.tar.gz libsigrokdecode-d842aebec31fd21fe0803cb9504ded698f6c1457.zip | |
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.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | decode.c | 1 |
2 files changed, 2 insertions, 2 deletions
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) @@ -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 |