From b61e0de250d522ec9a8e16146ef979a65c181db1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 20 Jul 2023 07:44:36 +0200
Subject: Change inner rule/prerequisites match order in install::file_rule

The old order messed up the for-install signaling logic. See the long comment
in install::file_rule::apply_impl() for background and details.
---
 libbuild2/version/rule.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'libbuild2/version')

diff --git a/libbuild2/version/rule.cxx b/libbuild2/version/rule.cxx
index 98dc2da..65c1117 100644
--- a/libbuild2/version/rule.cxx
+++ b/libbuild2/version/rule.cxx
@@ -93,6 +93,12 @@ namespace build2
       if (!fi)
         l5 ([&]{trace << "no in file prerequisite for target " << t;});
 
+      // If we match, derive the file name early as recommended by the in
+      // rule.
+      //
+      if (fm && fi)
+        t.derive_path ();
+
       return fm && fi;
     }
 
-- 
cgit v1.1