summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-05 07:05:05 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-05 07:05:05 +0000
commit1754ec8a59ce1350b2c0c0d927d752a59e915ae7 (patch)
treec49a48a4e6d00e8de693119a028daf419a60c91b
parent1fbd605da88c62a3a4d31ea3baf687ba9128e722 (diff)
* win32/Makefile.sub (config.h): follow recent changes about paths.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/Makefile.sub12
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c00a17ca321..049ce9ed84c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 5 16:04:29 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.h): follow recent changes about paths.
+
Thu Feb 5 14:26:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (MAJOR, MINOR, TEENY): uses RUBY_VERSION_*.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index f20009726f4..2f200a84245 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -489,11 +489,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define CANONICALIZATION_FOR_MATHN 1
#define DEFAULT_KCODE KCODE_NONE
#define DLEXT ".so"
-#define RUBY_LIB "/lib/$(RUBY_INSTALL_NAME)/$(ruby_version)"
-#define RUBY_SITE_LIB "/lib/$(RUBY_INSTALL_NAME)/site_ruby"
-#define RUBY_SITE_LIB2 "/lib/$(RUBY_INSTALL_NAME)/site_ruby/$(ruby_version)"
-#define RUBY_VENDOR_LIB "/lib/$(RUBY_INSTALL_NAME)/vendor_ruby"
-#define RUBY_VENDOR_LIB2 "/lib/$(RUBY_INSTALL_NAME)/vendor_ruby/$(ruby_version)"
+#define RUBY_LIB_VERSION STRINGIZE(RUBY_VERSION_MAJOR)"."STRINGIZE(RUBY_VERSION_MINOR)"."STRINGIZE(RUBY_VERSION_TEENY)
+#define RUBY_LIB_PREFIX "/lib/$(RUBY_INSTALL_NAME)"
+#define RUBY_LIB RUBY_LIB_PREFIX"/"RUBY_LIB_VERSION
+#define RUBY_SITE_LIB RUBY_LIB_PREFIX"/site_ruby"
+#define RUBY_SITE_LIB2 RUBY_SITE_LIB"/"RUBY_LIB_VERSION
+#define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby"
+#define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB"/"RUBY_LIB_VERSION
#define RUBY_PLATFORM "$(arch)"
#define RUBY_ARCHLIB "/lib/$(RUBY_INSTALL_NAME)/$(ruby_version)/$(ARCH)-$(PLATFORM)"
#define RUBY_SITE_ARCHLIB "/lib/$(RUBY_INSTALL_NAME)/site_ruby/$(ruby_version)/$(ARCH)-$(RT)"