[ostree] ostbuild: Check for the Makefile in the correct directory



commit aeeed8da13086baefcff4b2e5c6a62727226ad4d
Author: Colin Walters <walters verbum org>
Date:   Sat Jan 14 16:54:00 2012 -0500

    ostbuild: Check for the Makefile in the correct directory

 src/ostbuild/pyostbuild/builtin_compile_one.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/builtin_compile_one.py b/src/ostbuild/pyostbuild/builtin_compile_one.py
index 87d4bcf..de99d67 100755
--- a/src/ostbuild/pyostbuild/builtin_compile_one.py
+++ b/src/ostbuild/pyostbuild/builtin_compile_one.py
@@ -161,7 +161,10 @@ class OstbuildCompileOne(builtins.Builtin):
         args.extend(self.configargs)
         run_sync(args, cwd=builddir)
 
-        makefile_path = os.path.join(builddir, 'Makefile')
+        if use_builddir:
+            makefile_path = os.path.join(builddir, 'Makefile')
+        else:
+            makefile_path = '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]