sigrok-cross-mingw: Update patch to match recent changes.
authorUwe Hermann <uwe@hermann-uwe.de>
Tue, 25 Aug 2015 15:10:13 +0000 (17:10 +0200)
committerUwe Hermann <uwe@hermann-uwe.de>
Tue, 25 Aug 2015 15:10:13 +0000 (17:10 +0200)
cross-compile/mingw/libsigrok_firmwaredir.patch

index 6299afe957436fcf0672955f276b8ae67d1380bb..51d26b5fcb85182eb236d4e010f6759afbc42f14 100644 (file)
@@ -1,13 +1,13 @@
-diff --git a/configure.ac b/configure.ac
-index dc4771e..a1274a2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -484,7 +484,7 @@ AC_SEARCH_LIBS([pow], [m])
- # We need to link against the Winsock2 library for SCPI over TCP.
- AS_CASE([$host], [*mingw*], [LIBS="$LIBS -lws2_32"])
+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