From c711529fc2e807051af031ae7a26d3c293ff8ca7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 31 Aug 2016 11:28:44 +0200
Subject: build2 build system fixes

---
 build/root.build | 4 +---
 buildfile        | 3 +++
 odb/buildfile    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/root.build b/build/root.build
index 174f292..fb0de84 100644
--- a/build/root.build
+++ b/build/root.build
@@ -2,8 +2,6 @@
 # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-using cxx
-
 cxx.std = 11
 
-tests/: install = false # Don't install tests.
+using cxx
diff --git a/buildfile b/buildfile
index 554e881..230a01c 100644
--- a/buildfile
+++ b/buildfile
@@ -6,4 +6,7 @@ d = odb/ tests/
 ./: $d doc{GPLv2 INSTALL LICENSE NEWS README version} file{manifest}
 include $d
 
+# Don't install tests or the INSTALL file.
+#
+dir{tests/}: install = false
 doc{INSTALL}@./: install = false
diff --git a/odb/buildfile b/odb/buildfile
index fa212ea..7bbf495 100644
--- a/odb/buildfile
+++ b/odb/buildfile
@@ -106,7 +106,7 @@ install.include = $install.include/odb/
 install.include.subdirs = true # Recreate subdirectories.
 
 if ($cxx.target.class != "windows")
-  details/win32/: install = false
+  details/win32/*: install = false
 
 # We want these to be picked up even when LIBODB_BUILD2 is not defined.
 #
-- 
cgit v1.1