make/autoconf/platform.m4

*** 476,485 ****
--- 476,493 ----
    elif test "x$OPENJDK_$1_CPU" != x; then
      HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
    fi
    AC_SUBST(HOTSPOT_$1_CPU_DEFINE)
  
+   # For historical reasons, the OS include directories have odd names.
+   OPENJDK_$1_OS_INCLUDE_SUBDIR="$OPENJDK_TARGET_OS"
+   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+     OPENJDK_$1_OS_INCLUDE_SUBDIR="win32"
+   elif test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+     OPENJDK_$1_OS_INCLUDE_SUBDIR="darwin"
+   fi
+   AC_SUBST(OPENJDK_$1_OS_INCLUDE_SUBDIR)
  ])
  
  AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
  [
    if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then