[ostree] Revert "ostbuild: Check for the Makefile in the correct directory"
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] Revert "ostbuild: Check for the Makefile in the correct directory"
- Date: Mon, 16 Jan 2012 14:42:19 +0000 (UTC)
commit b1ff693ea3d892f204fe12bbb28a2d7c31949052
Author: Colin Walters <walters verbum org>
Date: Mon Jan 16 09:39:13 2012 -0500
Revert "ostbuild: Check for the Makefile in the correct directory"
I'm not sure how this made anything work...probably I was screwing
something else up.
This reverts commit aeeed8da13086baefcff4b2e5c6a62727226ad4d.
src/ostbuild/pyostbuild/builtin_compile_one.py | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/builtin_compile_one.py b/src/ostbuild/pyostbuild/builtin_compile_one.py
index b18f00d..08d3614 100755
--- a/src/ostbuild/pyostbuild/builtin_compile_one.py
+++ b/src/ostbuild/pyostbuild/builtin_compile_one.py
@@ -152,10 +152,7 @@ class OstbuildCompileOne(builtins.Builtin):
args.extend(self.configargs)
run_sync(args, cwd=builddir)
- if use_builddir:
- makefile_path = os.path.join(builddir, 'Makefile')
- else:
- makefile_path = 'Makefile'
+ makefile_path = os.path.join(builddir, 'Makefile')
if not os.path.exists(makefile_path):
fatal("No Makefile found")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]