[java-atk-wrapper] Build: set propertiesdir & java_atk_wrapperdir
- From: Magdalen Berns <mberns src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper] Build: set propertiesdir & java_atk_wrapperdir
- Date: Thu, 4 Dec 2014 21:49:04 +0000 (UTC)
commit a964d9d28fd96bbf1ac9345644324e6fa91947bb
Author: Magdalen Berns <m berns thismagpie com>
Date: Thu Dec 4 21:42:58 2014 +0000
Build: set propertiesdir & java_atk_wrapperdir
propertiesdir and java_atk_wrapperdir should install to
$JAVA_HOME/lib and $JAVA_HOME/lib/ext respectively when user
is root.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=741127
configure.ac | 2 ++
wrapper/Makefile.am | 10 ++++++++++
2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1a42669..5606274 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,8 @@ AC_OUTPUT([
wrapper/org/GNOME/Accessibility/Makefile
])
+AM_CONDITIONAL(USER, test `whoami` = "root")
+
echo "
Build configuration:
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 3ff2d26..31ed022 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -3,12 +3,22 @@ JARFILES=java-atk-wrapper.jar
ALL_CLASSES=org/GNOME/Accessibility/*.class
DEP_CLASSES=$(wildcard $(ALL_CLASSES))
+if USER
+java_atk_wrapperdir = $(JAVA_HOME)/lib/ext
+else
java_atk_wrapperdir = $(prefix)/jre/lib/ext
+endif
+
java_atk_wrapper_DATA = $(JARFILES)
EXTRA_DIST = $(properties_DATA)
+if USER
+propertiesdir = $(JAVA_HOME)/lib
+else
propertiesdir = $(prefix)/jre/lib
+endif
+
properties_DATA = accessibility.properties
$(JARFILES) : $(DEP_CLASSES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]