X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Flibsigrok_firmwaredir.patch;h=51d26b5fcb85182eb236d4e010f6759afbc42f14;hp=d9d351ac829944d4ca338b1b5782d680309e6ea4;hb=629182a8430b563228061deb89424ec85600a452;hpb=0e3c8b38ad793bcfbd45588ead106135997cc31c diff --git a/cross-compile/mingw/libsigrok_firmwaredir.patch b/cross-compile/mingw/libsigrok_firmwaredir.patch index d9d351a..51d26b5 100644 --- a/cross-compile/mingw/libsigrok_firmwaredir.patch +++ b/cross-compile/mingw/libsigrok_firmwaredir.patch @@ -1,13 +1,13 @@ -diff --git a/configure.ac b/configure.ac -index cbe91cf..447c7e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -543,7 +543,7 @@ AC_TYPE_SIZE_T - # Checks for library functions. - AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull]) +diff --git a/Makefile.am b/Makefile.am +index 9519056..334f4df 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,7 @@ ACLOCAL_AMFLAGS = -I m4 + AM_LIBTOOLFLAGS = --silent + MAKEFLAGS = --no-print-directory --AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware") -+AC_SUBST(FIRMWARE_DIR, "firmware") - AC_SUBST(MAKEFLAGS, '--no-print-directory') - AC_SUBST(AM_LIBTOOLFLAGS, '--silent') +-FIRMWARE_DIR = $(datadir)/sigrok-firmware ++FIRMWARE_DIR = firmware + local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. + if BINDINGS_CXX