Code

bindings/java/Makefile.am: Install to $pkgdatadir/java/.
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 11 May 2009 13:13:41 +0000 (15:13 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 11 May 2009 13:13:41 +0000 (15:13 +0200)
And don't use $(builddir): It may be an empty string, making handling of this
variable cumbersome.

bindings/java/Makefile.am

index 6eead28e38b4472b7c2d2c738f04b7f5b1f5d097..668335a70ade8f179dd1a0bf7ea143f9636be72f 100644 (file)
@@ -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"