[java-atk-wrapper/wip] Build: tidy up root check

[Magdalen Berns <mberns src gnome org>]

commit 4ed46b81338e03a129db40a9a10468767fd1cb71
Author: Magdalen Berns <m berns thismagpie com>
Date:   Tue Jun 23 17:29:57 2015 +0100

    Build: tidy up root check
    
    Also put wrapper and properties in a tidier place
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=750533

 wrapper/Makefile.am |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 5b78e8a..01cf422 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -4,18 +4,14 @@ ALL_CLASSES=org/GNOME/Accessibility/*.class
 DEP_CLASSES=$(wildcard $(ALL_CLASSES))
 
 if USER
-java_atk_wrapperdir = $(JDK_SRC)/jre/lib/ext
+java_atk_wrapperdir = $(JAVA_HOME)/lib/ext
+propertiesdir = $(JAVA_HOME)/lib
 else
-java_atk_wrapperdir = $(HOME)/.local$(JDK_SRC)/jre/lib/ext
-endif
-java_atk_wrapper_DATA = $(JARFILES)
-
-if USER
-propertiesdir = $(JDK_SRC)/jre/lib
-else
-propertiesdir = $(HOME)/.local$(JAVA_HOME)/lib
+java_atk_wrapperdir = $(HOME)/.local/share/java-atk-wrapper$(JAVA_HOME)/lib/ext
+propertiesdir = $(HOME)/.local/share/java-atk-wrapper$(JAVA_HOME)/lib
 endif
 
+java_atk_wrapper_DATA = $(JARFILES)
 properties_DATA = accessibility.properties
 EXTRA_DIST = $(properties_DATA)