From d6ceed8279573277d92dd150d21ac01d7a6683dd Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 29 Sep 2009 13:33:50 +0200
Subject: Build system improvements

Add support for building with bundled build. Update boost import stub.
---
 build/bootstrap.make | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'build/bootstrap.make')

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 9897964..25dc2d8 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -5,7 +5,16 @@
 
 project_name := libxsd-frontend
 
-include build-0.3/bootstrap.make
+# First try to include the bundled bootstrap.make if it exist. If that
+# fails, let make search for the external bootstrap.make.
+#
+build := build-0.3
+
+-include $(dir $(lastword $(MAKEFILE_LIST)))../../$(build)/bootstrap.make
+
+ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),)
+include $(build)/bootstrap.make
+endif
 
 # Aliases
 #
-- 
cgit v1.1