Two small fixes for out-of-tree builds
Here are two fixes that I found the need for while building 1:1.16.12-1 for Debian. -Hilko
--- 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
On Tue, Mar 27, 2012 at 10:03:03PM +0200, Hilko Bengen wrote:
--- 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 $@
ACK, although [I'm told] it's better to use $(srcdir) instead of @srcdir@. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/
On Wed, Mar 28, 2012 at 12:05:01AM +0200, Hilko Bengen wrote:
* Richard W.M. Jones:
ACK, although [I'm told] it's better to use $(srcdir) instead of @srcdir@.
I am wondering, in what way is it better?
No idea, I just was told that the @ method is deprecated. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org
* Richard W.M. Jones:
On Wed, Mar 28, 2012 at 12:05:01AM +0200, Hilko Bengen wrote:
* Richard W.M. Jones:
ACK, although [I'm told] it's better to use $(srcdir) instead of @srcdir@.
I am wondering, in what way is it better?
No idea, I just was told that the @ method is deprecated.
Perhaps the idea is to make it clear that $(foo) is processed through automake while @foo@ is processed through configure? I have adapted and pushed both patches. Cheers, -Hilko
--- 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
On Tue, Mar 27, 2012 at 10:03:04PM +0200, Hilko Bengen wrote:
--- 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
ACK, with the same comment as before. Please push these. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org
participants (2)
-
Hilko Bengen -
Richard W.M. Jones