From 818ece50e85249bfda8ff6c1daf7a289ead453a2 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 11 May 2009 15:13:41 +0200 Subject: [PATCH] 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. --- bindings/java/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index 6eead28..668335a 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"