aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-29 04:07:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-29 04:07:06 +0000
commit23008fcc2e10430163332972f82821be28f7b1a2 (patch)
treea150a2129d0f11f3e1eb093a78861bdc43f1f1cd
parentafa7b27e8b40a6820d13290aa607247db1e7e90a (diff)
downloadruby-23008fcc2e10430163332972f82821be28f7b1a2.tar.gz
define PLATFORM_DIR if needed
* Makefile.in, configure.in (PLATFORM_DIR): define if needed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in2
-rw-r--r--configure.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index d201fbf59a..a68b3b2c49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,7 @@ NULL = /dev/null
srcdir = @srcdir@
top_srcdir = $(srcdir)
hdrdir = $(srcdir)/include
-PLATFORM_DIR = win32
+PLATFORM_DIR = @PLATFORM_DIR@
CC = @CC@
CPP = @CPP@
diff --git a/configure.in b/configure.in
index 8555395f74..bfd9f49fac 100644
--- a/configure.in
+++ b/configure.in
@@ -2626,6 +2626,7 @@ AS_CASE(["$target_os"],
# COMMON_MACROS="WIN32_LEAN_AND_MEAN="
COMMON_HEADERS="winsock2.h windows.h"
THREAD_MODEL=win32
+ PLATFORM_DIR=win32
])
LIBRUBY_ALIASES=''
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
@@ -2776,6 +2777,7 @@ AC_SUBST(EXPORT_PREFIX)
AC_SUBST(SYMBOL_PREFIX)
AC_SUBST(MINIOBJS)
AC_SUBST(THREAD_MODEL)
+AC_SUBST(PLATFORM_DIR)
MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
MAKEFILES="`echo $MAKEFILES`"