* mkconfig.rb: merge multiple entries to an entry with multiple lines.

* lib/mkmf.rb: allow a series of commands to link.

* win32/Makefile.sub: embed manifests.

* win32/setup.mak: suffix OS name by runtime version.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 2 deletions

diff --git a/win32/setup.mak b/win32/setup.mak
index 4f46807901..1d463d1b36 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -69,7 +69,7 @@ int
 runtime_name()
 {
     char libpath[MAXPATHLEN+1];
-    char *p, *base = NULL;
+    char *p, *base = NULL, *ver = NULL;
     HMODULE msvcrt = NULL;
     MEMORY_BASIC_INFORMATION m;
 
@@ -87,9 +87,17 @@ runtime_name()
     if (!base) return 0;
     if (p = strchr(base, '.')) *p = '\0';
     for (p = base; *p; p = CharNext(p)) {
-	if (isascii(*p) && isupper(*p))
+	if (!isascii(*p)) continue;
+	if (isupper(*p)) {
 	    *p = tolower(*p);
+	}
+	if (!isdigit(*p)) {
+	    ver = NULL;
+	} else if (!ver) {
+	    ver = p;
+	}
     }
+    if (ver) printf("OS = $$(OS)_%s\n", ver);
     printf("RT = %s\n", base);
     return 1;
 }