summaryrefslogtreecommitdiff
path: root/oowintool
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2010-09-14 10:54:49 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2010-09-14 10:54:49 +0200
commit929ee2f488c8ef6e7d144f00f4da486f9ec28f94 (patch)
treeb14f855883cc0dc05db7b99c12615377b8be194b /oowintool
parent452ead8acb9c6d6f72ce556f4b16a15e67aa164f (diff)
oowintool-java6.diff: Detect java 6 correctly.
Diffstat (limited to 'oowintool')
-rwxr-xr-xoowintool1
1 files changed, 1 insertions, 0 deletions
diff --git a/oowintool b/oowintool
index 0b4be43f9a7e..8d2e4750d096 100755
--- a/oowintool
+++ b/oowintool
@@ -265,6 +265,7 @@ sub print_jdk_dir()
{
my $dir =
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
+ reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.6/JavaHome") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
print cygpath($dir, 'w', $output_format);