summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHilko Bengen <bengen@hilluzination.de>2012-03-27 21:57:56 +0200
committerRichard W.M. Jones <rjones@redhat.com>2012-03-30 15:38:47 +0100
commit83c41b83a7ae70cda183830172628440d98e9899 (patch)
tree91c9e7fd6139350308f9858e4227a027e31b01cc
parent7ad67a6c611d44bc3562f45b4299193756a9ffea (diff)
downloadlibguestfs-83c41b83a7ae70cda183830172628440d98e9899.tar.gz
libguestfs-83c41b83a7ae70cda183830172628440d98e9899.tar.xz
libguestfs-83c41b83a7ae70cda183830172628440d98e9899.zip
Fix out-of-tree build for Java bindings
(cherry picked from commit 4db251048bd0aca2b98247109f00e68c2080a71c)
-rw-r--r--java/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/Makefile.am b/java/Makefile.am
index d47d7ebb..2a8b77b8 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -58,7 +58,7 @@ libguestfs_jardir = $(JAR_INSTALL_DIR)
libguestfs_jar_DATA = libguestfs-${VERSION}.jar
libguestfs_jar_class_files = $(java_sources:.java=.class)
$(libguestfs_jar_class_files): %.class: %.java
- $(JAVAC) $(JAVAC_FLAGS) -d $(builddir) -classpath @srcdir@:$(builddir) -sourcepath @srcdir@:$(builddir) $<
+ $(JAVAC) $(JAVAC_FLAGS) -d $(builddir) -classpath $(srcdir):$(builddir) $(srcdir)/$<
libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
$(JAR) cf $@ $^
@@ -82,7 +82,7 @@ BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
com_redhat_et_libguestfs_GuestFS.h: $(java_prefix)/GuestFS.class
rm -f $@
- $(JAVAH) -classpath @srcdir@:$(builddir) com.redhat.et.libguestfs.GuestFS
+ $(JAVAH) -classpath $(srcdir):$(builddir) com.redhat.et.libguestfs.GuestFS
# Documentation.