[19] ridir is new 1.9 value in RbConfig::CONFIG

jruby · Sep 29, 2009 · 00e6e5e · 00e6e5e
1 parent a3b8800
commit 00e6e5e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/org/jruby/libraries/RbConfigLibrary.java b/src/org/jruby/libraries/RbConfigLibrary.java
@@ -161,6 +161,7 @@ public void load(Ruby runtime, boolean wrap) {
         String siteLibDir = new NormalizedFile(libdir, "ruby/site_ruby/1.8").getPath();
         String siteArchDir = new NormalizedFile(libdir, "ruby/site_ruby/1.8/java").getPath();
         String archDir = new NormalizedFile(libdir, "ruby/1.8/java").getPath();
+        String shareDir = new NormalizedFile(normalizedHome, "share").getPath();
 
         setConfig(configHash, "libdir", libdir);
         setConfig(configHash, "rubylibdir",     rubyLibDir);
@@ -170,7 +171,7 @@ public void load(Ruby runtime, boolean wrap) {
         setConfig(configHash, "archdir",   archDir);
         setConfig(configHash, "topdir",   archDir);
         setConfig(configHash, "configure_args", "");
-        setConfig(configHash, "datadir", new NormalizedFile(normalizedHome, "share").getPath());
+        setConfig(configHash, "datadir", shareDir);
         setConfig(configHash, "mandir", new NormalizedFile(normalizedHome, "man").getPath());
         setConfig(configHash, "sysconfdir", new NormalizedFile(normalizedHome, "etc").getPath());
         setConfig(configHash, "localstatedir", new NormalizedFile(normalizedHome, "var").getPath());
@@ -181,6 +182,10 @@ public void load(Ruby runtime, boolean wrap) {
         } else {
             setConfig(configHash, "EXEEXT", "");
         }
+
+        if (runtime.is1_9()) {
+            setConfig(configHash, "ridir", new NormalizedFile(shareDir, "ri").getPath());
+        }
 
         RubyHash mkmfHash = RubyHash.newHash(runtime);