diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-11-22 18:02:04 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2016-11-22 18:02:04 (GMT) |
| commit | 0946ce59a09609b743b7dba40f7212778011f286 (patch) | |
| tree | aa666685885104ed985b4c743ad3222968e7ae54 /scripts/build/companion_tools/050-make.sh | |
| parent | 3eb2e351f02d82fad255a9e6433c4c4d659c5de0 (diff) | |
| parent | 87bfd55b3b5329c7f306fa291ca5e0950a2c9da1 (diff) | |
Merge pull request #479 from stilor/gmake-link-fix
Gmake link fix
Diffstat (limited to 'scripts/build/companion_tools/050-make.sh')
| -rw-r--r-- | scripts/build/companion_tools/050-make.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index 3d6da7c..9458a25 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -1,7 +1,5 @@ # Build script for make -CT_MAKE_VERSION=3.81 - do_companion_tools_make_get() { CT_GetFile "make-${CT_MAKE_VERSION}" \ {http,ftp,https}://ftp.gnu.org/gnu/make @@ -20,10 +18,10 @@ do_companion_tools_make_build() { CT_DoExecLog CFG "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \ --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" - CT_DoExecLog ALL ${make} - CT_DoExecLog ALL ${make} install - if [ "${CT_COMP_TOOLS_make_gmake}" = "y" ]; then - CT_DoExecLog ALL ln -sv ${make} "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake" + CT_DoExecLog ALL make + CT_DoExecLog ALL make install + if [ "${CT_MAKE_GMAKE_SYMLINK}" = "y" ]; then + CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake" fi CT_Popd CT_EndStep |