From bbb864455ac8d10a0e9a011bf79ac6d62515ad65 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 4 Nov 2020 11:34:21 +0200
Subject: Fix buildfile

---
 buildfile | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/buildfile b/buildfile
index d5df087..6896329 100644
--- a/buildfile
+++ b/buildfile
@@ -1,7 +1,9 @@
 # file      : buildfile
 # license   : MIT; see accompanying LICENSE file
 
-assert ($build.meta_operation == 'dist') 'only dist meta-operation allowed'
+assert ($build.meta_operation == 'dist'      || \
+        $build.meta_operation == 'configure' || \
+        $build.meta_operation == 'disfigure') 'only dist and configure supported'
 
 # Package repository URL (or path).
 #
@@ -9,6 +11,14 @@ build2_repo="https://stage.build2.org/1"
 # build2_repo="https://pkg.cppget.org/1/queue/alpha"
 # build2_repo="https://pkg.cppget.org/1/alpha"
 
+# @@ Note that the project directories order is important (prerequisites go
+#    first).
+#
+# See also subprojects in bootstrap.build.
+#
+d = libpkgconf/ libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \
+libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/ tests/*/
+
 i =                     \
 INSTALL                 \
 UPGRADE                 \
@@ -19,16 +29,12 @@ BOOTSTRAP-WINDOWS-MSVC  \
 BOOTSTRAP-WINDOWS-CLANG \
 BOOTSTRAP-WINDOWS-MINGW
 
-# Note: see also subprojects in bootstrap.build.
-#
-./: {*/ -build/ -tests/ -submodules/} \
-    doc{$i README}                    \
-    legal{LICENSE AUTHORS}            \
-    cli{$i}                           \
+./: $d                          \
+    doc{$i README tests/README} \
+    legal{LICENSE AUTHORS}      \
+    cli{$i}                     \
     manifest
 
-./: tests/*/ tests/doc{README}
-
 # Obtain the build2, bpkg, bdep, and toolchain versions.
 #
 bp = $recall($build.path)
-- 
cgit v1.1