Mercurial > hg > heapstats
changeset 134:55b5034ab722
Bug 2801: Remove extra / to build debuginfo correctly
Reviewed-by: yasuenag
GitHub: https://github.com/HeapStats/heapstats/pull/2
| author | KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp> |
|---|---|
| date | Fri, 22 Jan 2016 01:50:58 +0900 |
| parents | 936a1776ba30 |
| children | a8c44d8b2172 |
| files | ChangeLog configure configure.ac |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 22 00:33:37 2016 +0900 +++ b/ChangeLog Fri Jan 22 01:50:58 2016 +0900 @@ -1,6 +1,7 @@ 2016-01-22 KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp> * Bug 2797: Sync docs and config between icedtea and github + * Bug 2801: Remove extra / to build debuginfo correctly 2016-01-18 Yasumasa Suenaga <yasuenag@gmail.com>
--- a/configure Fri Jan 22 00:33:37 2016 +0900 +++ b/configure Fri Jan 22 01:50:58 2016 +0900 @@ -8179,7 +8179,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVA_HOME using java in /etc/alternatives" >&5 $as_echo_n "checking for JAVA_HOME using java in /etc/alternatives... " >&6; } # We have to get JDK directory, not JRE directory - JDK_DIR=`$READLINK -f "$JAVA_PATH" 2>$DEVNULL | $SED -e 's:\(jre/\|\)bin/java::g' 2>$DEVNULL` + JDK_DIR=`$READLINK -f "$JAVA_PATH" 2>$DEVNULL | $SED -e 's:/\(jre/\|\)bin/java::g' 2>$DEVNULL` if test $? -ne 0 ; then JDK_DIR="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
--- a/configure.ac Fri Jan 22 00:33:37 2016 +0900 +++ b/configure.ac Fri Jan 22 01:50:58 2016 +0900 @@ -210,7 +210,7 @@ else AC_MSG_CHECKING([for JAVA_HOME using java in /etc/alternatives]) # We have to get JDK directory, not JRE directory - JDK_DIR=`$READLINK -f "$JAVA_PATH" 2>$DEVNULL | $SED -e 's:\(jre/\|\)bin/java::g' 2>$DEVNULL` + JDK_DIR=`$READLINK -f "$JAVA_PATH" 2>$DEVNULL | $SED -e 's:/\(jre/\|\)bin/java::g' 2>$DEVNULL` if test $? -ne 0 ; then JDK_DIR="" AC_MSG_RESULT([not found])