summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@adonis.trinhall.cam.ac.uk>2006-11-14 16:04:45 +0000
committerMatthew Johnson <mjj29@adonis.trinhall.cam.ac.uk>2006-11-14 16:04:45 +0000
commitd62f325b9cb77d2c2000d66c255908d2a57bc842 (patch)
tree23f8ee2b34949c1f914225a849ce745b41b73763 /Makefile
parentc88c3e7be6d9c4c69d2806027cc2a38302c919b9 (diff)
whoops
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 667f58d..5ef0fa5 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,9 @@ LIBPREFIX?=$(PREFIX)/lib/jni
BINPREFIX?=$(PREFIX)/bin
DOCPREFIX?=$(PREFIX)/share/doc/libdbus-java
MANPREFIX?=$(PREFIX)/share/man/man1
+RUNPREFIX?=$(PREFIX)
+RUNJARPREFIX?=$(RUNPREFIX)/share/java
+RUNLIBPREFIX?=$(RUNPREFIX)/lib/jni
VERSION = 1.11
RELEASEVERSION = 1.10
@@ -192,11 +195,11 @@ install: dbus-java-viewer-$(VERSION).jar libdbus-java-$(VERSION).jar libdbus-jav
install -d $(LIBPREFIX)
install libdbus-java.so $(LIBPREFIX)
install -d $(BINPREFIX)
- sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/DBusViewer > $(BINPREFIX)/DBusViewer
+ sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/DBusViewer > $(BINPREFIX)/DBusViewer
chmod +x $(BINPREFIX)/DBusViewer
- sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/CreateInterface > $(BINPREFIX)/CreateInterface
+ sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/CreateInterface > $(BINPREFIX)/CreateInterface
chmod +x $(BINPREFIX)/CreateInterface
- sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/ListDBus > $(BINPREFIX)/ListDBus
+ sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/ListDBus > $(BINPREFIX)/ListDBus
chmod +x $(BINPREFIX)/ListDBus
install-doc: doc CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL