]> sigrok.org Git - sigrok-util.git/commitdiff
Pass home directory to makensis.
authorMartin Ling <redacted>
Fri, 6 Dec 2013 01:46:45 +0000 (01:46 +0000)
committerUwe Hermann <redacted>
Sat, 7 Dec 2013 11:29:43 +0000 (12:29 +0100)
cross-compile/mingw/sigrok-cross-mingw

index e3bc71fc79855b048d0c017ee194f04b4e176f3a..6b6c2ac4c4c1fe79ec3c21c148dc795b6ba4c91f 100755 (executable)
@@ -105,7 +105,7 @@ git clone git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
 cd sigrok-cli
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
-makensis contrib/sigrok-cli_cross.nsi
+makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
 cd ..
 
 # PulseView
 cd ..
 
 # PulseView
@@ -114,6 +114,6 @@ cd pulseview
 # Temporary workaround: append (not prepend) "-llzma -llcms2" to the linker.
 sed -i '247a \\tlist(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack' CMakeLists.txt
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
 # Temporary workaround: append (not prepend) "-llzma -llcms2" to the linker.
 sed -i '247a \\tlist(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack' CMakeLists.txt
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
-makensis contrib/pulseview_cross.nsi
+makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..
 
 cd ..