[java-atk-wrapper] Change JDK_HOME to JDK_SRC

[Magdalen Berns <mberns src gnome org>]

commit 85e8f03b0002ec07448645d033819c14e6009a88
Author: Magdalen Berns <m berns thismagpie com>
Date:   Sat Oct 18 00:08:27 2014 +0100

    Change JDK_HOME to JDK_SRC
    
    misleading since it doesn't reference the home directory but
    the root directory where jdk is referenced from.
    
    Bug https://bugzilla.gnome.org/show_bug.cgi?id=738730

 acinclude.m4        |   10 +++++-----
 configure.ac        |   10 +++++-----
 wrapper/Makefile.am |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index 7575399..d1581cd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,7 +9,7 @@ case "$host" in
     if test "$gcj_compile" = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/win32"
+      JNI_INCLUDES="-I$JDK_SRC/include -I$JDK_SRC/include/win32"
     fi
     platform_win32="yes"
     PLATFORM_CFLAGS="-mms-bitfields"
@@ -21,7 +21,7 @@ case "$host" in
     if test "$gcj_compile" = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/win32"
+      JNI_INCLUDES="-I$JDK_SRC/include -I$JDK_SRC/include/win32"
     fi
     platform_win32="yes"
     PLATFORM_CFLAGS=
@@ -33,7 +33,7 @@ case "$host" in
     if test "$gcj_compile" = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/linux"
+      JNI_INCLUDES="-I$JDK_SRC/include -I$JDK_SRC/include/linux"
     fi
     PLATFORM_CFLAGS=
     PLATFORM_LDFLAGS=
@@ -44,7 +44,7 @@ case "$host" in
     if test "$gcj_compile" = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/solaris"
+      JNI_INCLUDES="-I$JDK_SRC/include -I$JDK_SRC/include/solaris"
     fi
     PLATFORM_CFLAGS=
     PLATFORM_LDFLAGS=
@@ -55,7 +55,7 @@ case "$host" in
     if test "$gcj_compile" = "yes"; then
       JNI_INCLUDES=
     else
-      JNI_INCLUDES="-I$JDK_HOME/include -I$JDK_HOME/include/$host_os"
+      JNI_INCLUDES="-I$JDK_SRC/include -I$JDK_SRC/include/$host_os"
     fi
     PLATFORM_CFLAGS=
     PLATFORM_LDFLAGS=
diff --git a/configure.ac b/configure.ac
index 51ab303..3503d8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ JAVA_REQUIRED=1.5
 JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge"
 
 AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
-AC_ARG_VAR([JDK_HOME],[JDK installation path])
+AC_ARG_VAR([JDK_SRC],[JDK installation path])
 
 if test -z "$JAVA_HOME"; then
   JAVA_PATH=${PATH}
@@ -104,13 +104,13 @@ if test "x$with_jdk_auto_detect" = "xyes"; then
        SRC_DIR=`dirname $0`
        SRC_DIR=`cd $SRC_DIR;pwd;cd $CUR_DIR`
        $JAVAC $JAVACFLAGS $SRC_DIR/JavaInfo.java
-       JDK_HOME="`CLASSPATH=$SRC_DIR $JAVA JavaInfo`"
+       JDK_SRC="`CLASSPATH=$SRC_DIR $JAVA JavaInfo`"
 else
-       if test -z "$JDK_HOME"; then
-               AC_MSG_ERROR("You should specify JDK_HOME")
+       if test -z "$JDK_SRC"; then
+               AC_MSG_ERROR("You should specify JDK_SRC")
        fi
 fi
-AC_SUBST(JDK_HOME)
+AC_SUBST(JDK_SRC)
 
 CHECK_JNI
 
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index e9f8b16..63b9d8f 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -3,12 +3,12 @@ JARFILES=java-atk-wrapper.jar
 ALL_CLASSES=org/GNOME/Accessibility/*.class
 DEP_CLASSES=$(wildcard $(ALL_CLASSES))
 
-java_atk_wrapperdir = $(JDK_HOME)/jre/lib/ext
+java_atk_wrapperdir = $(JDK_SRC)/jre/lib/ext
 java_atk_wrapper_DATA = $(JARFILES)
 
 EXTRA_DIST = $(properties_DATA)
 
-propertiesdir = $(JDK_HOME)/jre/lib
+propertiesdir = $(JDK_SRC)/jre/lib
 properties_DATA = accessibility.properties
 
 $(JARFILES) : $(DEP_CLASSES)