From 6c060f2375cf0ef3402b8d8b36fdc6852ba82bd5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 24 Mar 2009 17:39:45 +0000 Subject: [PATCH] Finally make ncurses-5.7 corctly build: - find the executables extension (needed under some OS, like Winblows) - build tic in // - simplify the make and install command lines /trunk/scripts/build/debug/300-gdb.sh | 10 7 3 0 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- scripts/build/debug/300-gdb.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index fcc74447..2c2c27ba 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -158,13 +158,17 @@ do_debug_gdb_build() { --with-build-cflags="${CT_CFLAGS_FOR_HOST}" \ ${ncurses_opts} + # Under some operating systems (eg. Winblows), there is an + # extension appended to executables. Find that. + tic_ext=$(grep -E '^x[[:space:]]*=' progs/Makefile |sed -r -e 's/^.*=[[:space:]]*//;') + CT_DoLog EXTRA "Building ncurses tic" - CT_DoExecLog ALL make -C "${CT_BUILD_DIR}/build-ncurses-build-tic/include" - CT_DoExecLog ALL make -C "${CT_BUILD_DIR}/build-ncurses-build-tic/progs" tic + CT_DoExecLog ALL make ${PARALLELMFLAGS} -C include + CT_DoExecLog ALL make ${PARALLELMFLAGS} -C progs "tic${tic_ext}" CT_DoLog EXTRA "Installing ncurses tic" CT_DoExecLog ALL install -d -m 0755 "${CT_PREFIX_DIR}/bin" - CT_DoExecLog ALL install -m 0755 "${CT_BUILD_DIR}/build-ncurses-build-tic/progs/tic" "${CT_PREFIX_DIR}/bin/tic" + CT_DoExecLog ALL install -m 0755 "progs/tic${tic_ext}" "${CT_PREFIX_DIR}/bin" CT_EndStep