build: Do not hard-code decoders location on Windows

diff --git a/Makefile.am b/Makefile.am
index 02f76d9e63fd77aad5f3d5006ba016aa9da0c5da..cd93059a68392f8bee8d99f5323c3aaa467e2398 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,12 @@ AM_LIBTOOLFLAGS = --silent
 GNUMAKEFLAGS = --no-print-directory
 
 DECODERS_DIR = $(pkgdatadir)/decoders
 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)"'
 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)
 
 # 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 53e8bc1abb660f57e1d7bb1dce9d253023a9fe18..09bfd56802356600c495fd1b456ace7b844fa0ba 100644 (file)
--- 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])
 
 # 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  ##
 ############################
 ############################
 ##  Package dependencies  ##
 ############################