Here are two fixes that I found the need for while building 1:1.16.12-1 for Debian. -Hilko
Hilko Bengen
2012-Mar-27 20:03 UTC
[Libguestfs] [PATCH 1/2] Fix out-of-tree build for appliance
--- appliance/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am index ac37017..c90078e 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -73,7 +73,7 @@ supermin.d/daemon.img: ../daemon/guestfsd guestfsd.suppressions rm -rf tmp mkdir -p tmp$(DAEMON_SUPERMIN_DIR) tmp/etc ln ../daemon/guestfsd tmp$(DAEMON_SUPERMIN_DIR)/guestfsd - ln guestfsd.suppressions tmp/etc/guestfsd.suppressions + ln @srcdir@/guestfsd.suppressions tmp/etc/guestfsd.suppressions ( cd tmp && find | cpio --quiet -o -H newc ) > $@-t rm -rf tmp mv $@-t $@ -- 1.7.9.1
Hilko Bengen
2012-Mar-27 20:03 UTC
[Libguestfs] [PATCH 2/2] Fix out-of-tree build for Java bindings
---
java/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/java/Makefile.am b/java/Makefile.am
index c753672..a01f100 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 $@ $^
--
1.7.9.1