metaconfig unit changes for #13932.

p4raw-id: //depot/metaconfig@13933

diff --git a/U/compline/nblock_io.U b/U/compline/nblock_io.U
index a65982b..bee50cd 100644 (file)
--- a/U/compline/nblock_io.U
+++ b/U/compline/nblock_io.U
@@ -206,7 +206,7 @@ int main()
                ret = read(pd[0], buf, 1);      /* Should read EOF */
                alarm(0);
                sprintf(string, "%d\n", ret);
-               write(3, string, strlen(string));
+               write(4, string, strlen(string));
                exit(0);
        }
 
@@ -221,7 +221,7 @@ EOCP
        if eval $compile_ok; then
 ?X: Use script to avoid the possible 'alarm call' message
                echo "$startsh" >mtry
-               echo "$run ./try >try.out 2>try.ret 3>try.err || exit 4" >>mtry
+               echo "$run ./try >try.out 2>try.ret 4>try.err || exit 4" >>mtry
                chmod +x mtry
                ./mtry >/dev/null 2>&1
                case $? in

diff --git a/U/modified/Head.U b/U/modified/Head.U
index 4d27b99..1556981 100644 (file)
--- a/U/modified/Head.U
+++ b/U/modified/Head.U
@@ -279,10 +279,4 @@ test -d UU || mkdir UU
 ?X: Use ./* to avoid any confirmation prompts from enhanced shells -- WED
 cd UU && rm -f ./*
 
-?X: are we running on the Stratus VOS operating system?
-if test -f "/system/gnu_library/bin/ar.pm"; then
-     _exe=".pm"
-else
-     _exe=""
-fi
 

diff --git a/U/modified/Init.U b/U/modified/Init.U
new file mode 100644 (file)
index 0000000..bffd875
--- /dev/null
+++ b/U/modified/Init.U
@@ -0,0 +1,60 @@
+?RCS: $Id: Init.U,v 3.0.1.1 1994/10/31 09:45:59 ram Exp $
+?RCS:
+?RCS: Copyright (c) 1991-1993, Raphael Manfredi
+?RCS: 
+?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: of the source tree for dist 3.0.
+?RCS:
+?RCS: $Log: Init.U,v $
+?RCS: Revision 3.0.1.1  1994/10/31  09:45:59  ram
+?RCS: patch44: removed Options from MAKE to prevent Init overrides
+?RCS: patch44: option processing now done after Myinit thanks to new Begin.U
+?RCS: patch44: moved "Beginning of configuration questions" to Begin.U
+?RCS: patch44: moved signal trapping instruction to Begin.U as well
+?RCS:
+?RCS: Revision 3.0  1993/08/18  12:05:02  ram
+?RCS: Baseline for dist 3.0 netwide release.
+?RCS:
+?X: 
+?X: This file initializes certain default variables used by Configure.  They
+?X: may be overridden or added to by definitions in Myinit.U.
+?X:
+?MAKE:Init eunicefix: Null
+?MAKE: -pick add $@ %<
+?MAKE: -pick weed $@ ./Init
+?S:eunicefix:
+?S:    When running under Eunice this variable contains a command which will
+?S:    convert a shell script to the proper form of text file for it to be
+?S:    executable by the shell.  On other systems it is a no-op.
+?S:.
+?V:define undef smallmach:rmlist
+?X:
+?X: Throughout the units, one may make use of $define and $undef to reference
+?X: a defined symbol or an undefined one. There is no need to add them in
+?X: the dependency line since this unit makes them visible via ?V:, and
+?X: everyone inherits from those symbols since by convention Init.U is the
+?X: root dependency.
+?X:
+define='define'
+undef='undef'
+smallmach='pdp11 i8086 z8000 i80286 iAPX286'
+rmlist=''
+
+: We must find out about Eunice early
+eunicefix=':'
+if test -f /etc/unixtovms; then
+       eunicefix=/etc/unixtovms
+fi
+if test -f /etc/unixtovms.exe; then
+       eunicefix=/etc/unixtovms.exe
+fi
+
+?X: Set executable suffix now -- needed before hints available
+?X: Are we running on the Stratus VOS operating system?
+if test -f "/system/gnu_library/bin/ar.pm"; then
+     _exe=".pm"
+fi
+

diff --git a/U/modified/Loc.U b/U/modified/Loc.U
index f8a9d2e..3a6d9e7 100644 (file)
--- a/U/modified/Loc.U
+++ b/U/modified/Loc.U
@@ -295,6 +295,7 @@ case "$egrep" in
 egrep)
        echo "Substituting grep for egrep."
        egrep=$grep
+       _egrep=$grep
        ;;
 esac
 @if ln
@@ -302,6 +303,7 @@ case "$ln" in
 ln)
        echo "Substituting cp for ln."
        ln=$cp
+       _ln=$cp
        ;;
 esac
 @end
@@ -324,6 +326,7 @@ gmake)      ;;
                # and prefer it over the system make.
                echo "Substituting gmake for make."
                make=$gmake
+               _make=$gmake
        fi
        ;;
 esac