sigrok-cross-mingw: Don't add $PREFIX/bin to the PATH.

[sigrok-util.git] / cross-compile / mingw / sigrok-cross-mingw

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index c52ef22272b6e828d2b623efb8994c27ab048715..c86ada2bf8ecf4c987f4f6c3d0f7b156cc05848e 100755 (executable)
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -28,7 +28,7 @@ MXE=$HOME/mxe-git
 PREFIX=$HOME/sr_mingw
 
 # The path where to download files to and where to build packages.
-BUILDDIR=./sr_mingw_build
+BUILDDIR=./build
 
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
@@ -46,8 +46,8 @@ WGET="wget --quiet"
 
 # -----------------------------------------------------------------------------
 
-# We need to find tools in the toolchain and in the install directory.
-export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH
+# We need to find tools in the toolchain.
+export PATH=$MXE/usr/bin:$PATH
 
 P="$PREFIX/lib/pkgconfig"
 P2="$MXE/usr/i686-pc-mingw32/lib/pkgconfig"
@@ -149,6 +149,12 @@ make $PARALLEL V=1
 make install
 cd ..
 
+# sigrok-dumps
+git clone git://sigrok.org/sigrok-dumps
+cd sigrok-dumps
+make install DESTDIR=$PREFIX/share/sigrok-dumps
+cd ..
+
 # sigrok-cli
 git clone git://sigrok.org/sigrok-cli
 cd sigrok-cli