From 0cc45912f6ab2779b9c2f4079feee214d4bd0c6f Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 23 Dec 2022 00:26:40 +0800 Subject: update configure --- configure | 6 +++++- core/src/tbox/tbox | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0b939eeb5..7cd8d3ab8 100755 --- a/configure +++ b/configure @@ -3535,6 +3535,10 @@ _gmake_add_switches() { echo "V=@" >> "${xmake_sh_makefile}" echo "endif" >> "${xmake_sh_makefile}" echo "" >> "${xmake_sh_makefile}" + echo "ifeq (\$(PREFIX),)" >> "${xmake_sh_makefile}" + echo "PREFIX=${_install_prefix_default}" >> "${xmake_sh_makefile}" + echo "endif" >> "${xmake_sh_makefile}" + echo "" >> "${xmake_sh_makefile}" } _gmake_add_flags() { @@ -3758,7 +3762,7 @@ _gmake_add_install_target() { path_filename "${targetfile}"; local filename="${_ret}" _get_target_item "${target}" "installdir"; local installdir="${_ret}" if test_z "${installdir}"; then - installdir=${_install_prefix_default} + installdir="\$(PREFIX)" fi # install target file diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox index a2d005d16..8706cffe2 160000 --- a/core/src/tbox/tbox +++ b/core/src/tbox/tbox @@ -1 +1 @@ -Subproject commit a2d005d1664b03792337a758c8f993298117bb0b +Subproject commit 8706cffe25fad0278bcf95b8b4f95978c7b38982 -- cgit v1.3.1