1.1 --- a/scripts/build/libc/mingw.sh	Sat Aug 14 23:14:27 2010 +0200
     1.2 +++ b/scripts/build/libc/mingw.sh	Sat Aug 14 23:21:06 2010 +0200
     1.3 @@ -41,9 +41,9 @@
     1.4      CT_DoStep INFO "Installing C library headers"
     1.5  
     1.6      CT_DoLog EXTRA "Installing MinGW Runtime headers"
     1.7 -    mkdir -p "${CT_SYSROOT_DIR}/include"
     1.8 -    cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include \
     1.9 -          ${CT_SYSROOT_DIR}
    1.10 +    mkdir -p "${CT_HEADERS_DIR}"
    1.11 +    cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include/* \
    1.12 +          ${CT_HEADERS_DIR}
    1.13  
    1.14      CT_EndStep
    1.15  }
    1.16 @@ -60,7 +60,7 @@
    1.17      mkdir -p "${CT_BUILD_DIR}/build-w32api"
    1.18      cd "${CT_BUILD_DIR}/build-w32api"
    1.19  
    1.20 -    CFLAGS="-I${CT_SYSROOT_DIR}/include"                          \
    1.21 +    CFLAGS="-I${CT_HEADERS_DIR}"                                  \
    1.22      LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                             \
    1.23      CT_DoExecLog ALL                                              \
    1.24      "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/configure" \
    1.25 @@ -78,7 +78,7 @@
    1.26      mkdir -p "${CT_BUILD_DIR}/build-mingwrt"
    1.27      cd "${CT_BUILD_DIR}/build-mingwrt"
    1.28  
    1.29 -    CFLAGS="-I${CT_SYSROOT_DIR}/include"                            \
    1.30 +    CFLAGS="-I${CT_HEADERS_DIR}"                                    \
    1.31      LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                               \
    1.32      CT_DoExecLog ALL                                                \
    1.33      "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/configure" \
    1.34 @@ -120,7 +120,7 @@
    1.35          CT_DoLog EXTRA "Installing PDCurses development files"
    1.36          chmod a+r ${CT_SRC_DIR}/PDCurses-${CT_MINGW_PDCURSES_VERSION}/*.h
    1.37          cp ${CT_SRC_DIR}/PDCurses-${CT_MINGW_PDCURSES_VERSION}/*.h \
    1.38 -           ${CT_SYSROOT_DIR}/include
    1.39 +           ${CT_HEADERS_DIR}
    1.40          cp pdcurses.a ${CT_SYSROOT_DIR}/lib/libpdcurses.a
    1.41          cp pdcurses.a ${CT_SYSROOT_DIR}/lib/libncurses.a
    1.42      fi