From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 11 May 2009 13:13:41 +0000 (+0200)
Subject: bindings/java/Makefile.am: Install to $pkgdatadir/java/.
X-Git-Tag: collectd-4.7.0~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=818ece50e85249bfda8ff6c1daf7a289ead453a2;p=collectd.git

bindings/java/Makefile.am: Install to $pkgdatadir/java/.

And don't use $(builddir): It may be an empty string, making handling of this
variable cumbersome.
---

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 6eead28e..668335a7 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -20,16 +20,16 @@ EXTRA_DIST = org/collectd/api/CollectdConfigInterface.java \
 	     org/collectd/api/ValueList.java
 
 java-build-stamp: org/collectd/api/*.java
-	$(JAVAC) -d "$(builddir)" "$(srcdir)/org/collectd/api"/*.java
+	$(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
 	touch "$@"
 
 all-local: java-build-stamp
 
 install-exec-local: java-build-stamp
-	mkdir -p "$(pkglibdir)/java/org/collectd/api"
-	$(INSTALL) -m 644 "$(builddir)/org/collectd/api"/*.class \
-		"$(DESTDIR)$(pkglibdir)/java/org/collectd/api/"
+	mkdir -p "$(pkgdatadir)/java/org/collectd/api"
+	$(INSTALL) -m 644 "org/collectd/api"/*.class \
+		"$(DESTDIR)$(pkgdatadir)/java/org/collectd/api/"
 
 clean-local:
-	rm -f "$(builddir)/org/collectd/api"/*.class
-	rm -f "$(builddir)/java-build-stamp"
+	rm -f "org/collectd/api"/*.class
+	rm -f "java-build-stamp"