diff options
| author | Daniel Elstner <daniel.kitta@gmail.com> | 2015-10-03 14:17:07 +0200 |
|---|---|---|
| committer | Daniel Elstner <daniel.kitta@gmail.com> | 2015-10-03 14:17:07 +0200 |
| commit | 583001b3f16795abd24278fbb2e5232a7ca27fb0 (patch) | |
| tree | 5bf8f92bd4fdc9141107ae065fd0c64950930fa4 | |
| parent | 40c6ac1d3fbded276dcbff23e8bc099896ab2fb5 (diff) | |
| download | libsigrokdecode-583001b3f16795abd24278fbb2e5232a7ca27fb0.tar.gz libsigrokdecode-583001b3f16795abd24278fbb2e5232a7ca27fb0.zip | |
build: Do not hard-code decoders location on Windows
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 02f76d9..cd93059 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,12 @@ AM_LIBTOOLFLAGS = --silent GNUMAKEFLAGS = --no-print-directory DECODERS_DIR = $(pkgdatadir)/decoders +# Do not hard-code the decoders location on Windows. +if WIN32 +AM_CPPFLAGS = +else AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"' +endif # The tests CFLAGS are a superset of the libsigrokdecode CFLAGS. AM_CFLAGS = $(SRD_EXTRA_CFLAGS) $(SRD_WFLAGS) $(TESTS_CFLAGS) diff --git a/configure.ac b/configure.ac index 53e8bc1..09bfd56 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,8 @@ SR_PKG_VERSION_SET([SRD_PACKAGE_VERSION], [AC_PACKAGE_VERSION]) # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info SR_LIB_VERSION_SET([SRD_LIB_VERSION], [2:0:0]) +AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"]) + ############################ ## Package dependencies ## ############################ |