summaryrefslogtreecommitdiff
blob: 232417db8ca797c062b8f9d9b0bc0d04c4d1e470 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
Index: Makefile.PL
===================================================================
RCS file: /cvsroot/freewrl/freewrl/freewrl/Makefile.PL,v
retrieving revision 1.154
diff -u -r1.154 Makefile.PL
--- Makefile.PL	29 Nov 2005 16:31:25 -0000	1.154
+++ Makefile.PL	11 Dec 2005 04:49:51 -0000
@@ -160,6 +160,12 @@
 $VRML_CONFIG{LDFLAGS} = join(' ', @ldflags);
 $VRML_CONFIG{LIBJS_INST} = $sitearchjsdir;
 
+if (defined $VRML_CONFIG{'USE_JAVA_HOME'})
+{
+	$VRML_CONFIG{JAVA} = $ENV{JAVA_HOME}.'/bin/java';
+	$VRML_CONFIG{JAVA_INST} = $ENV{JAVA_HOME};
+}
+
 # write the Config.pm file.
 print STDERR "Writing Config.pm\n";
 open OUT, ">Config.pm" or die("Couldn't write to Config.pm");
Index: vrml.conf
===================================================================
RCS file: /cvsroot/freewrl/freewrl/freewrl/vrml.conf,v
retrieving revision 1.55
diff -u -r1.55 vrml.conf
--- vrml.conf	12 Oct 2005 13:01:07 -0000	1.55
+++ vrml.conf	11 Dec 2005 04:49:51 -0000
@@ -35,6 +35,8 @@
 # some wrl/x3d files are zipped; how do we unzip them?
 UNZIP => "/bin/gunzip",	
 
+USE_JAVA_HOME => 1,
+
 # Java compiler. Java, Jikes, etc is ok, so long as it is not ancient.
 #if you do not have Java, comment this and the JAVA_INST line below out.
 JAVA => "/usr/bin/java",