[java-atk-wrapper] remove workaround for non root installs



commit 31c5fa339fefc6df320a0340acea35e6bbeccd3b
Author: Magdalen Berns <m berns thismagpie com>
Date:   Wed Dec 31 19:40:20 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 |   10 ----------
 2 files changed, 0 insertions(+), 12 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..220f3cc 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -3,22 +3,12 @@ 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]