diff --git a/build.sh b/build.sh index 2aba1f9220122c5b660712377f06005cb18290e8..877f3da3446fe6eda7b4ba5e298bb7380d284233 100755 --- a/build.sh +++ b/build.sh @@ -74,6 +74,7 @@ cd ${BUILD_DIR}/build #debug out echo "$CMAKE ${BUILD_OPTIONS[@]}" - -"${CMAKE[@]}" ../../ ${BUILD_OPTIONS[@]} -"${MAKE[@]}" +export INSTALL_ROOT=${BUILD_DIR}/dist +"${CMAKE[@]}" ${HERE}/../ ${BUILD_OPTIONS[@]} +"${MAKE[@]}" -j$(nproc) +"${MAKE[@]}" install DESTDIR=${INSTALL_ROOT} diff --git a/oldscripts/linux/debian/essentials/config b/oldscripts/linux/debian/essentials/config index 47ad739daed123b6de28f9ce0b20f4425bb0a5fb..ae86fd75b0014578d1e200710f8cf86103673e4d 100755 --- a/oldscripts/linux/debian/essentials/config +++ b/oldscripts/linux/debian/essentials/config @@ -53,6 +53,15 @@ reconfigure|configure) db_go || true fi + db_input critical cellframe-node/mileena_enabled || true + db_go || true + + db_get cellframe-node/mileena_enabled + if [ "$RET" = "true" ]; then + db_input critical cellframe-node/mileena_node_type || true + db_go || true + fi + db_input critical cellframe-node/enable_python_plugins || true db_go || true diff --git a/targets/windows.sh b/targets/windows.sh index 73746dd1243fc9fd36152b686841458c930eca46..2bd3129d3cea035fe488053bbc065b789c918712 100644 --- a/targets/windows.sh +++ b/targets/windows.sh @@ -20,12 +20,13 @@ then exit 255 fi -#qmake command -CMAKE=(${MXE_ROOT}/usr/bin/x86_64-w64-mingw32.static-cmake) +#cmake command +#mxe install prefix if configured by mxe, need to change it +CMAKE=(${MXE_ROOT}/usr/bin/x86_64-w64-mingw32.static-cmake ) export PATH=${MXE_ROOT}/usr/bin:$PATH #everything else can be done by default make MAKE=(make) echo "Windows target" echo "CMAKE=${CMAKE[@]}" -echo "MAKE=${MAKE[@]}" \ No newline at end of file +echo "MAKE=${MAKE[@]}"