1.1 --- a/scripts/build/libc/mingw.sh	Sat Aug 14 23:21:06 2010 +0200
     1.2 +++ b/scripts/build/libc/mingw.sh	Sun Aug 15 00:00:51 2010 +0200
     1.3 @@ -44,6 +44,7 @@
     1.4      mkdir -p "${CT_HEADERS_DIR}"
     1.5      cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include/* \
     1.6            ${CT_HEADERS_DIR}
     1.7 +    CT_DoExecLog ALL ln -sv "usr" "${CT_SYSROOT_DIR}/mingw"
     1.8  
     1.9      CT_EndStep
    1.10  }
    1.11 @@ -65,6 +66,7 @@
    1.12      CT_DoExecLog ALL                                              \
    1.13      "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/configure" \
    1.14          --prefix=${CT_SYSROOT_DIR}                                \
    1.15 +        --includedir=${CT_HEADERS_DIR}                            \
    1.16          --host=${CT_TARGET}
    1.17  
    1.18      CT_DoLog EXTRA "Building W32-API"
    1.19 @@ -83,6 +85,7 @@
    1.20      CT_DoExecLog ALL                                                \
    1.21      "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/configure" \
    1.22          --prefix=${CT_SYSROOT_DIR}/                                 \
    1.23 +        --includedir=${CT_HEADERS_DIR}                              \
    1.24          --host=${CT_TARGET}
    1.25  
    1.26      CT_DoLog EXTRA "Building MinGW Runtime"
    1.27 @@ -95,6 +98,9 @@
    1.28  }
    1.29  
    1.30  do_libc_finish() {
    1.31 +    # Remove the build-symlink now it is no longer needed.
    1.32 +    CT_DoExecLog ALL rm -f "${CT_SYSROOT_DIR}/mingw"
    1.33 +
    1.34      CT_DoStep INFO "Installing MinGW Development libraries"
    1.35  
    1.36      CT_Pushd "${CT_SYSROOT_DIR}"
    1.37 @@ -120,7 +126,7 @@
    1.38          CT_DoLog EXTRA "Installing PDCurses development files"
    1.39          chmod a+r ${CT_SRC_DIR}/PDCurses-${CT_MINGW_PDCURSES_VERSION}/*.h
    1.40          cp ${CT_SRC_DIR}/PDCurses-${CT_MINGW_PDCURSES_VERSION}/*.h \
    1.41 -           ${CT_HEADERS_DIR}
    1.42 +           ${CT_HEADERS_DIR}/
    1.43          cp pdcurses.a ${CT_SYSROOT_DIR}/lib/libpdcurses.a
    1.44          cp pdcurses.a ${CT_SYSROOT_DIR}/lib/libncurses.a
    1.45      fi
    1.46 @@ -137,6 +143,7 @@
    1.47              --build=${CT_BUILD}           \
    1.48              --host=${CT_TARGET}           \
    1.49              --prefix=${CT_SYSROOT_DIR}    \
    1.50 +            --includedir=${CT_HEADERS_DIR}  \
    1.51              --enable-shared               \
    1.52              --enable-static
    1.53