summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@trick.home.annexia.org>2009-07-16 18:04:01 +0100
committerRichard Jones <rjones@trick.home.annexia.org>2009-07-16 18:04:01 +0100
commita865795a7edfdc939cf3864ca1b7ea9cdc564dc7 (patch)
treeed0b50d08cdb7fc439f1b6d4168b42855338e6ca
parent4f3736162076419641a6225ac28b29d340020604 (diff)
downloadlibguestfs-a865795a7edfdc939cf3864ca1b7ea9cdc564dc7.tar.gz
libguestfs-a865795a7edfdc939cf3864ca1b7ea9cdc564dc7.tar.xz
libguestfs-a865795a7edfdc939cf3864ca1b7ea9cdc564dc7.zip
More misc fixes to non-srcdir builds.
-rw-r--r--appliance/Makefile.am2
-rw-r--r--perl/Makefile.am5
-rw-r--r--ruby/Rakefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 17a49d7f..9dad378a 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -144,7 +144,7 @@ test-boot-realistic: emptydisk
# Make clean.
-CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist
+CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles
clean-local:
rm -rf $(top_builddir)/initramfs
diff --git a/perl/Makefile.am b/perl/Makefile.am
index 55761b90..9e329693 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -48,6 +48,11 @@ all: Makefile-pl
Makefile-pl: Makefile.PL
perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
+CLEANFILES = Makefile-pl
+
+clean-local:
+ -$(MAKE) -f Makefile-pl clean
+
install-data-hook:
$(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
index 400ea0f4..a0002553 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -27,7 +27,7 @@ PKG_VERSION='@PACKAGE_VERSION@'
EXT_CONF='@srcdir@/ext/guestfs/extconf.rb'
MAKEFILE='@builddir@/ext/guestfs/Makefile'
GUESTFS_MODULE='@builddir@/ext/guestfs/_guestfs.so'
-GUESTFS_SRC='@builddir@/ext/guestfs/_guestfs.c'
+GUESTFS_SRC='@srcdir@/ext/guestfs/_guestfs.c'
CLEAN.include [ "@builddir@/ext/**/*.o", GUESTFS_MODULE,
"@builddir@/ext/**/depend" ]