From 0ac445c69d9121410aafb772a7b5dc7a8a79e7df Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 5 Nov 2015 10:58:53 +0100
Subject: [PATCH] 8141439: Fix compare.sh -o <otherdir> (broken by JDK-8136813)

Reviewed-by: tbell, erikj
---
 common/autoconf/compare.sh.in | 2 ++
 common/bin/compare.sh         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/autoconf/compare.sh.in b/common/autoconf/compare.sh.in
index b7bf2b4cecb..05f0f6c6729 100644
--- a/common/autoconf/compare.sh.in
+++ b/common/autoconf/compare.sh.in
@@ -86,4 +86,6 @@ fi
 $RM $OUTPUT_ROOT/compare.log.old 2> /dev/null
 $MV $OUTPUT_ROOT/compare.log $OUTPUT_ROOT/compare.log.old 2> /dev/null
 
+export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
+
 $BASH $SRC_ROOT/common/bin/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
diff --git a/common/bin/compare.sh b/common/bin/compare.sh
index 7952b2b6abb..0c63bdcbeca 100644
--- a/common/bin/compare.sh
+++ b/common/bin/compare.sh
@@ -989,7 +989,7 @@ if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
     fi
 fi
 
-THIS="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
+THIS="$SCRIPT_DIR"
 echo "$THIS"
 THIS_SCRIPT="$0"