Add support for buildfile importation

1 files changed, 29 insertions, 6 deletions

diff --git a/libbuild2/buildfile b/libbuild2/buildfile
index b3a9c52..6d7c597 100644
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -191,14 +191,37 @@ if! $cross
 {
   {obja objs}{context}: cxx.poptions += \
     -DBUILD2_IMPORT_PATH=\"$regex.replace($out_root, '\\', '\\\\')\"
+}
+
+# Note that while the -installed object file should only be linked when we
+# are installing, it will be compiled even in the uninstalled case.
+#
+if ($install.root != [null])
+{
+  # Only if installed.
+  #
+  {obja objs}{utility-installed}: cxx.poptions += \
+    -DBUILD2_INSTALL_LIB=\"$regex.replace(\
+      $install.resolve($install.lib), '\\', '\\\\')\"
 
-  # While this object file should only be linked when we are installing, it
-  # will be compiled even in the uninstalled case.
+  # Only if configured.
+  #
+  # Note: strip the last directory component (<project>).
   #
-  if ($install.root != [null])
-    {obja objs}{utility-installed}: cxx.poptions += \
-      -DBUILD2_INSTALL_LIB=\"$regex.replace(\
-        $install.resolve($install.lib), '\\', '\\\\')\"
+  # @@ TMP drop after 0.16.0 release.
+  #
+  install_buildfile = ($install.buildfile != [null] \
+                       ? $directory($install.resolve($install.buildfile)) \
+                       :)
+  {obja objs}{utility-installed utility-uninstalled}: cxx.poptions += \
+    -DBUILD2_INSTALL_BUILDFILE=\"$regex.replace($install_buildfile, '\\', '\\\\')\"
+
+  #\
+  {obja objs}{utility-installed utility-uninstalled}: cxx.poptions += \
+    -DBUILD2_INSTALL_BUILDFILE=\"$regex.replace(\
+      $directory($install.resolve($install.buildfile)), '\\', '\\\\')\"
+  #\
+
 }
 
 if ($cxx.target.class != 'windows')