[java-atk-wrapper] Build: fix non-root install configuration

[Magdalen Berns <mberns src gnome org>]

commit 75147c0fe46c8f3ccc17e6547cb8e7c383896e94
Author: Magdalen Berns <m berns thismagpie com>
Date:   Sun Jun 7 23:19:35 2015 +0100

    Build: fix non-root install configuration
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=750533

 configure.ac        |    2 +-
 wrapper/Makefile.am |   14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 449907a..9b20532 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,6 @@ LIB_ATK_WRAPPER_LT_VERSION=3:22:2
 AC_SUBST(LIB_ATK_WRAPPER_LT_VERSION)
 
 # jni
-
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_CC(gcc)
@@ -60,6 +59,7 @@ AC_SUBST(LIB_ATK_WRAPPER_LD_FLAGS)
 
 # java wrapper
 
+AM_CONDITIONAL(USER, test `whoami` = "root")
 JAVA_REQUIRED=1.6
 JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge"
 
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 220f3cc..50c1b28 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -3,13 +3,21 @@ JARFILES=java-atk-wrapper.jar
 ALL_CLASSES=org/GNOME/Accessibility/*.class
 DEP_CLASSES=$(wildcard $(ALL_CLASSES))
 
-java_atk_wrapperdir = $(JAVA_HOME)/lib/ext
+if USER
+java_atk_wrapperdir = $(JRE_SRC)/lib/ext
+else
+java_atk_wrapperdir = $(HOME)/.local$(JRE_SRC)/lib/ext
+endif
 java_atk_wrapper_DATA = $(JARFILES)
 
-EXTRA_DIST = $(properties_DATA)
-
+if USER
 propertiesdir = $(JAVA_HOME)/lib
+else
+propertiesdir = $(HOME)/.local$(JAVA_HOME)/lib
+endif
+
 properties_DATA = accessibility.properties
+EXTRA_DIST = $(properties_DATA)
 
 $(JARFILES) : $(DEP_CLASSES)
        $(JAR) cf $(JARFILES) $(ALL_CLASSES)