[jhbuild] Fix clean for autooled modules with srcdir != buildir (GNOME bug 597954)
- From: Frederic Peters <fpeters src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [jhbuild] Fix clean for autooled modules with srcdir != buildir (GNOME bug 597954)
- Date: Tue, 2 Feb 2010 22:48:35 +0000 (UTC)
commit 71c0e4b96763424d9b455d693eacd64fde72e4b5
Author: Jon TURNEY <jon turney dronecode org uk>
Date: Thu Oct 22 13:12:08 2009 +0100
Fix clean for autooled modules with srcdir != buildir (GNOME bug 597954)
autotools.py skip_clean incorrectly checks for the existence of the makefile
in the srcdir, not the build dir (where it will actually be created by autogen.sh)
This causes 'jhbuild build --clean' to not clean when srcdir != builddir
jhbuild/modtypes/autotools.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index e4e30d0..4d95ba1 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -193,10 +193,10 @@ class AutogenModule(Package, DownloadableModule):
PHASE_CLEAN, PHASE_DISTCLEAN]
def skip_clean(self, buildscript, last_phase):
- srcdir = self.get_srcdir(buildscript)
- if not os.path.exists(srcdir):
+ builddir = self.get_builddir(buildscript)
+ if not os.path.exists(builddir):
return True
- if not os.path.exists(os.path.join(srcdir, self.makefile)):
+ if not os.path.exists(os.path.join(builddir, self.makefile)):
return True
return False
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]