[java-atk-wrapper] remove workaround for non root installs
- From: Magdalen Berns <mberns src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper] remove workaround for non root installs
- Date: Wed, 31 Dec 2014 19:31:08 +0000 (UTC)
commit 3e7ce3376c50e5e42f43900d72edb5bda84f09b5
Author: Magdalen Berns <m berns thismagpie com>
Date: Wed Dec 31 19:30:23 2014 +0000
remove workaround for non root installs
It doesn't seem effective
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=742162
configure.ac | 2 --
wrapper/Makefile.am | 6 ------
2 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8d61de2..3afaf33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,8 +163,6 @@ 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 31ed022..4f42f0b 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -3,21 +3,15 @@ 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]