Move options variables from target scopes to buildscript scopes

2 files changed, 9 insertions, 11 deletions

diff --git a/cli/cli/buildfile b/cli/cli/buildfile
index 4e51ea5..5f51b67 100644
--- a/cli/cli/buildfile
+++ b/cli/cli/buildfile
@@ -102,11 +102,6 @@ pregenerated/
 #
 <{hxx ixx cxx}{options}>: cli{options} pregenerated/cli/exe{cli}
 {
-  options = --include-with-brackets --include-prefix cli   \
-            --guard-prefix CLI --generate-file-scanner     \
-            --generate-specifier --generate-modifier       \
-            --suppress-undocumented --reserved-name stdout
-
   dist = ($develop ? pregenerated/cli/ : false)
 
   # Symlink the generated code in src for convenience of development.
@@ -116,6 +111,11 @@ pregenerated/
 %
 if $develop
 {{
+  options = --include-with-brackets --include-prefix cli   \
+            --guard-prefix CLI --generate-file-scanner     \
+            --generate-specifier --generate-modifier       \
+            --suppress-undocumented --reserved-name stdout
+
   diag cli ($<[0])
   ($<[1]) $options -o $out_base $path($<[0])
 
diff --git a/cli/doc/buildfile b/cli/doc/buildfile
index 8e40fe4..07aa917 100644
--- a/cli/doc/buildfile
+++ b/cli/doc/buildfile
@@ -172,12 +172,11 @@ if $develop
 #        years hard-coded.
 #
 ps{cli-guide}: xhtml{cli-guide} html2ps{guide} $html2ps
-{
-  options =
-}
 %
 if $html2pdf
 {{
+  options =
+
   diag html2ps ($<[0])
   $html2ps $options -f $path($<[1]) -o $path($>) $path($<[0])
 
@@ -185,12 +184,11 @@ if $html2pdf
 }}
 
 pdf{cli-guide}: ps{cli-guide} $ps2pdf
-{
-  options = -dOptimize=true -dEmbedAllFonts=true
-}
 %
 if $html2pdf
 {{
+  options = -dOptimize=true -dEmbedAllFonts=true
+
   diag ps2pdf ($<[0])
   $ps2pdf $options $path($<[0]) $path($>)