From 83bb02cada0b894d9134cc5489999e0f0fe8bd7c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 8 Jul 2019 14:55:35 +0200
Subject: Move in build system module to separate library

---
 build/export.build | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'build')

diff --git a/build/export.build b/build/export.build
index 4847950..345baf0 100644
--- a/build/export.build
+++ b/build/export.build
@@ -11,12 +11,20 @@ if ($import.target == exe{b})
 
   export $out_root/build2/exe{b}
 }
-elif ($import.target == lib{build2})
+else
 {
   $out_root/
   {
     include libbuild2/
   }
 
-  export $out_root/libbuild2/lib{build2}
+  d = [dir_path] $out_root/libbuild2/
+  if ($import.target != lib{build2})
+  {
+    # Assume one of the modules.
+    #
+    d += $regex.replace($name($import.target), '^build2-(.+)', '\1')
+  }
+
+  export $d/$import.target
 }
-- 
cgit v1.1