diff options
| author | midipix <writeonce@midipix.org> | 2018-06-06 21:58:15 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2018-06-06 21:58:15 -0400 |
| commit | 60b4acfeec23d097c655185ea9b5cb0ecf40f8c8 (patch) | |
| tree | ee9d12d9c3b3720b8c7ffc9700927f0904398e93 | |
| parent | 6ad264a0d2269c7a62c3191528529ea427adef4e (diff) | |
| download | mpackage-60b4acfeec23d097c655185ea9b5cb0ecf40f8c8.tar.bz2 mpackage-60b4acfeec23d097c655185ea9b5cb0ecf40f8c8.tar.xz | |
installation environment: install.bat: properly test for SYSROOT==@sysroot@.
| -rwxr-xr-x | mpackage.sh | 1 | ||||
| -rwxr-xr-x | once/install.bat | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mpackage.sh b/mpackage.sh index 564abff..79588c7 100755 --- a/mpackage.sh +++ b/mpackage.sh @@ -196,6 +196,7 @@ gen_setup() for f in $(find -type f); do sed -e 's#@sysroot@#'"$mb_defroot"'#g' \ -e 's#@product@#'"$mb_product"'#g' \ + -e 's#@SYSROOT@#'"@sysroot@"'#g' \ $f > $f.tmp || exit 2 cat $f.tmp > $f || exit 2 diff --git a/once/install.bat b/once/install.bat index 5d285f9..32aa371 100755 --- a/once/install.bat +++ b/once/install.bat @@ -1,7 +1,7 @@ @echo off if "!%SYSROOT%!"=="!!" goto sysroot_missing -if "!%SYSROOT%!"=="!@sysroot@!" goto sysroot_invalid +if "!%SYSROOT%!"=="!@SYSROOT@!" goto sysroot_invalid pushd "%~dp0" |