From eb73ba6975b3c465469fa399747a1c0827972e0d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 16 Jul 2020 15:39:26 +0200
Subject: Review

---
 cli/cli/buildfile | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'cli/cli/buildfile')

diff --git a/cli/cli/buildfile b/cli/cli/buildfile
index 0b07265..108b3e3 100644
--- a/cli/cli/buildfile
+++ b/cli/cli/buildfile
@@ -27,7 +27,8 @@ libue{cli}: {hxx ixx txx cxx}{** -cli -version -options -**.test...} \
 
 hxx{version}: in{version} $src_root/manifest
 
-# Regenerate the options parsing code if the cli program is imported.
+# Provide the options parsing code generation recipe if the cli program is
+# available.
 #
 if ($cli != [null])
 {
@@ -38,8 +39,8 @@ if ($cli != [null])
               --generate-specifier --generate-modifier       \
               --suppress-undocumented --reserved-name stdout
 
-    # Include the generated cli files into the distribution and don't remove
-    # them when cleaning in src (so that clean results in a state identical to
+    # Include the generated files into the distribution and don't remove them
+    # when cleaning in src (so that clean results in a state identical to
     # distributed).
     #
     dist  = true
@@ -49,19 +50,9 @@ if ($cli != [null])
     # in case of a forwarded configuration.
     #
     backlink = overwrite
-
-    # @@ The headers are installed by default. Needs to be fixed in build2.
-    #    Another workaround is making options.cxx a primary ad hoc group
-    #    member.
-    #
-    install = false
   }
   {{
-    # @@ Change this to `diag cli ($<[0])` if/when it results with the same
-    #    diagnostics.
-    #
-    diag cli $directory($<[0])/cli{options}
-
+    diag cli ($<[0])
     $cli $options -o $out_base $path($<)
   }}
 }
-- 
cgit v1.1