From 83c41b83a7ae70cda183830172628440d98e9899 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@hilluzination.de>
Date: Tue, 27 Mar 2012 21:57:56 +0200
Subject: Fix out-of-tree build for Java bindings (cherry picked from commit
 4db251048bd0aca2b98247109f00e68c2080a71c)

---
 java/Makefile.am | 4 ++--
 1 file 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.
 
-- 
cgit