Fix include paths for out-of-tree builds

diff --git a/Makefile.am b/Makefile.am
index 6c769c11696e4f74f05959c675810702d3526935..915f0a9c283786ce5e5a698063ff833737d8e341 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-AM_CPPFLAGS = -Isrc -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 lib_LTLIBRARIES = libsigrok.la
 

diff --git a/configure.ac b/configure.ac
index d2f8926a3b1d4ecb79fdab777747a0fceb9283f7..9080e6a3f6e108868d5236570eaf11d03ea29a2d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -404,8 +404,8 @@ AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
 
 AC_SUBST(SR_PKGLIBS)
 
-CFLAGS="$CFLAGS -I./include/libsigrok $LIB_CFLAGS"
-CXXFLAGS="$CXXFLAGS -I./include -I./bindings/cxx/include $LIB_CFLAGS"
+CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS"
+CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
 
 # Find Java compiler and JNI includes for Java bindings.