metaconfig tweaks from Robin Barker to go with #17097;

update Glossary.patch and mkglossary.

p4raw-id: //depot/metaconfig@17098

diff --git a/U/Glossary.patch b/U/Glossary.patch
index 1d8b5d1..7bbdd61 100644 (file)
--- a/U/Glossary.patch
+++ b/U/Glossary.patch
@@ -1,7 +1,7 @@
-*** Glossary.orig      ma  8 huhti  20.23.31 2002
---- Glossary   ma  8 huhti  20.24.57 2002
+*** Glossary.orig      Sat Jun  8 19:33:14 2002
+--- Glossary   Sat Jun  8 19:33:28 2002
 ***************
-*** 3201,3207 ****
+*** 3294,3300 ****
        make_set_make='#'               # If your make program handles this for you,
        make_set_make="MAKE=$make"      # if it doesn't.
        I used a comment character so that we can distinguish a
@@ -9,7 +9,7 @@
        from an uncomputed value.
   
   mallocobj (mallocsrc.U):
---- 3201,3207 ----
+--- 3294,3300 ----
        make_set_make='#'               # If your make program handles this for you,
        make_set_make="MAKE=$make"      # if it doesn't.
        I used a comment character so that we can distinguish a
@@ -18,7 +18,7 @@
   
   mallocobj (mallocsrc.U):
 ***************
-*** 3310,3316 ****
+*** 3403,3409 ****
        whole thing is then lower-cased.
   
   n (n.U):
@@ -26,7 +26,7 @@
        command to suppress newline.  Otherwise it is null.  Correct usage is
        $echo $n "prompt for a question: $c".
   
---- 3310,3316 ----
+--- 3403,3409 ----
        whole thing is then lower-cased.
   
   n (n.U):
@@ -35,7 +35,7 @@
        $echo $n "prompt for a question: $c".
   
 ***************
-*** 3737,3745 ****
+*** 3866,3874 ****
        /bin/sh, though it's possible that some systems will have /bin/ksh,
        /bin/pdksh, /bin/ash, /bin/bash, or even something such as
        D:/bin/sh.exe.
@@ -45,7 +45,7 @@
   
   shar (Loc.U):
        This variable is defined but not used by Configure.
---- 3737,3745 ----
+--- 3866,3874 ----
        /bin/sh, though it's possible that some systems will have /bin/ksh,
        /bin/pdksh, /bin/ash, /bin/bash, or even something such as
        D:/bin/sh.exe.
@@ -56,7 +56,7 @@
   shar (Loc.U):
        This variable is defined but not used by Configure.
 ***************
-*** 3915,3921 ****
+*** 4044,4050 ****
   
   spitshell (spitshell.U):
        This variable contains the command necessary to spit out a runnable
@@ -64,7 +64,7 @@
   
   sPRId64 (quadfio.U):
        This variable, if defined, contains the string used by stdio to
---- 3915,3921 ----
+--- 4044,4050 ----
   
   spitshell (spitshell.U):
        This variable contains the command necessary to spit out a runnable

diff --git a/U/mkglossary b/U/mkglossary
index bc2be6a..e76373d 100755 (executable)
--- a/U/mkglossary
+++ b/U/mkglossary
@@ -17,6 +17,10 @@ push(@perl_units, @std_units);
 open(WANTED, "sort $PWD/Porting/config.sh|") || die "$0: open $PWD/Wanted: $!\n";
 
 print <<'EOM';
+
+!!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
+This file is built by metaconfig.
+
 This file contains a description of all the shell variables whose value is
 determined by the Configure script.  Variables intended for use in C
 programs (e.g. I_UNISTD) are already described in config_h.SH.  [`configpm'

diff --git a/dist-3.0at70b/jmake/bindex.SH b/dist-3.0at70b/jmake/bindex.SH
index b665600..f419d78 100755 (executable)
--- a/dist-3.0at70b/jmake/bindex.SH
+++ b/dist-3.0at70b/jmake/bindex.SH
@@ -148,7 +148,7 @@ foreach $rule (sort(keys %Seen)) {
        $line = $Wants{$rule};
        if (length($line)) {
                $line = "->$line.";
-               $line = do format($line);
+               $line = &format($line);
                print INDEX "$line\n";
        }
        $line = $Init{$rule};

diff --git a/dist-3.0at70b/mcon/U/make.U b/dist-3.0at70b/mcon/U/make.U
index 607e9d3..3c0db9c 100644 (file)
--- a/dist-3.0at70b/mcon/U/make.U
+++ b/dist-3.0at70b/mcon/U/make.U
@@ -20,9 +20,12 @@
 ?S:    This variable contains the string to be included in Makefile.SH
 ?S:    so that MAKE is set if needed, and not if not needed.
 ?S:    Possible values are:
+?S:
 ?S:    make_set_make='#'               # If your make program handles this for you,
+?S:
 ?S:    make_set_make="MAKE=$make"      # if it doesn't.
-?S:    I used a comment character so that we can distinguish a
+?S:
+?S:    This uses a comment character to distinguish a
 ?S:    'set' value (from a previous config.sh or Configure -D option)
 ?S:    from an uncomputed value.
 ?S:.

diff --git a/dist-3.0at70b/mcon/makegloss.SH b/dist-3.0at70b/mcon/makegloss.SH
index 9928355..69525ee 100755 (executable)
--- a/dist-3.0at70b/mcon/makegloss.SH
+++ b/dist-3.0at70b/mcon/makegloss.SH
@@ -113,14 +113,14 @@ while (<>) {
                $_ = "Unit: $unit";
                $_ .= " (Also defines $also)" if $also;
                $_ .= " (With private $internal)" if $internal;
-               $head .= do format($_);
+               $head .= &format($_);
                if ($wants) {
                        $_ = "Wants: $wants";
-                       $head .= do format($_);
+                       $head .= &format($_);
                }
                if ($option) {
                        $_ = "Optional: $option";
-                       $head .= do format($_);
+                       $head .= &format($_);
                }
                $head .= "\n";
        }