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.
astro · May 11, 2009 · 818ece5 · 818ece5
1 parent 0e187c2
commit 818ece5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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"