From a865795a7edfdc939cf3864ca1b7ea9cdc564dc7 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 16 Jul 2009 18:04:01 +0100 Subject: [PATCH] More misc fixes to non-srcdir builds. --- appliance/Makefile.am | 2 +- perl/Makefile.am | 5 +++++ ruby/Rakefile.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 17a49d7..9dad378 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 55761b9..9e32969 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 400ea0f..a000255 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" ] -- 1.8.3.1