diff options
Diffstat (limited to 'scripts/build/debug')
| -rw-r--r-- | scripts/build/debug/100-dmalloc.sh | 2 | ||||
| -rw-r--r-- | scripts/build/debug/200-duma.sh | 6 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 6 | ||||
| -rw-r--r-- | scripts/build/debug/400-ltrace.sh | 2 | ||||
| -rw-r--r-- | scripts/build/debug/500-strace.sh | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh index 2766ff80..2c5d80c7 100644 --- a/scripts/build/debug/100-dmalloc.sh +++ b/scripts/build/debug/100-dmalloc.sh @@ -47,7 +47,7 @@ do_debug_dmalloc_build() { CT_DoLog EXTRA "Installing dmalloc" CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" installincs installlib - CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" installutil + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" installutil CT_EndStep } diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index b8ef5a61..a2d6a544 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -47,12 +47,12 @@ do_debug_duma_build() { CT_DoLog EXTRA "Installing shared library link" ln -vsf ${duma_so} "${CT_SYSROOT_DIR}/usr/lib/libduma.so" 2>&1 |CT_DoLog ALL CT_DoLog EXTRA "Installing wrapper script" - mkdir -p "${CT_DEBUG_INSTALL_DIR}/usr/bin" + mkdir -p "${CT_DEBUGROOT_DIR}/usr/bin" # Install a simpler, smaller, safer wrapper than the one provided by D.U.M.A. sed -r -e 's:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/'"${duma_so}"':;' \ "${CT_LIB_DIR}/scripts/build/debug/duma.in" \ - >"${CT_DEBUG_INSTALL_DIR}/usr/bin/duma" - chmod 755 "${CT_DEBUG_INSTALL_DIR}/usr/bin/duma" + >"${CT_DEBUGROOT_DIR}/usr/bin/duma" + chmod 755 "${CT_DEBUGROOT_DIR}/usr/bin/duma" fi CT_Popd diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 24d87dd6..6acb5671 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -215,10 +215,10 @@ do_debug_gdb_build() { CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC} CT_DoLog EXTRA "Installing native gdb" - CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install # Building a native gdb also builds a gdbserver - find "${CT_DEBUG_INSTALL_DIR}" -type f -name gdbserver -exec rm -fv {} \; 2>&1 |CT_DoLog ALL + find "${CT_DEBUGROOT_DIR}" -type f -name gdbserver -exec rm -fv {} \; 2>&1 |CT_DoLog ALL unset ac_cv_func_strncmp_works @@ -269,7 +269,7 @@ do_debug_gdb_build() { CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC} CT_DoLog EXTRA "Installing gdbserver" - CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install CT_EndStep fi diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 48cbc7b2..f1e799c5 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -37,7 +37,7 @@ do_debug_ltrace_build() { CT_DoExecLog ALL make CT_DoLog EXTRA "Installing ltrace" - CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install CT_Popd CT_EndStep diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index 6b1ff4d2..174c8dcb 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -27,7 +27,7 @@ do_debug_strace_build() { CT_DoExecLog ALL make CT_DoLog EXTRA "Installing strace" - CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install CT_Popd CT_EndStep |