summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Shadura <andrew.shadura@collabora.co.uk>2019-03-10 17:50:30 +0000
committerAndrej Shadura <andrew.shadura@collabora.co.uk>2019-03-10 17:50:30 +0000
commit7c5e7e1c2ac3b9b31ec249586c7f9150d9a5edf3 (patch)
treeb36cf833086cf06bd8fe5d00da7922261427af7e
parent83d0d2cad1852679fcfe8e50706b9dd321e940f1 (diff)
Fix failure due to undefined variables
-rwxr-xr-xjh_build6
1 files changed, 3 insertions, 3 deletions
diff --git a/jh_build b/jh_build
index e7f95a7..7852366 100755
--- a/jh_build
+++ b/jh_build
@@ -110,15 +110,15 @@ Can be omitted if no extra files need to be included.
=cut
-my $JAVA_HOME = $ENV{'JAVA_HOME'};
-my $CLASSPATH_ORIG = $ENV{'CLASSPATH'};
+my $JAVA_HOME = defined $ENV{'JAVA_HOME'} ? $ENV{'JAVA_HOME'} : "";
+my $CLASSPATH_ORIG = defined $ENV{'CLASSPATH'} ? $ENV{'CLASSPATH'} : "";
my $CLASSPATH = $CLASSPATH_ORIG;
my @JH_JAR_EXTRA;
my $build_javadoc = 1;
my (@javac_opts, @javadoc_opts, $main_class, $do_clean);
my (@JAVAC, @JAVADOC, @JAR, @CLASSPATHDOCS, @builds);
-$CLASSPATH =~ tr/:/ / if defined($CLASSPATH_ORIG);
+$CLASSPATH =~ tr/:/ /;
@JH_JAR_EXTRA = split(' ', $ENV{'JH_JAR_EXTRA'}) if @JH_JAR_EXTRA;
init(options => {