Metaconfig units changes for #10283.

p4raw-id: //depot/metaconfig@10284

diff --git a/U/installdirs/inc_version_list.U b/U/installdirs/inc_version_list.U
index 0775bea..7d52554 100644 (file)
--- a/U/installdirs/inc_version_list.U
+++ b/U/installdirs/inc_version_list.U
@@ -12,7 +12,7 @@
 ?RCS:
 ?MAKE:inc_version_list inc_version_list_init: cat sed Getfile perl5 \
        version api_versionstring rm Myread archname prefix sitelib_stem \
-       bincompat5005
+       bincompat5005 exe_ext
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:inc_version_list:
@@ -97,7 +97,7 @@ else {
 EOPL
 chmod +x getverlist
 case "$inc_version_list" in
-'')    if test -x "$perl5"; then
+'')    if test -x "$perl5$exe_ext"; then
                dflt=`$perl5 getverlist`
        else
                dflt='none'

diff --git a/U/installdirs/perl5.U b/U/installdirs/perl5.U
index a83f0ba..b1f0024 100644 (file)
--- a/U/installdirs/perl5.U
+++ b/U/installdirs/perl5.U
@@ -13,7 +13,7 @@
 ?X:    We check for 5.005 and later because inc_version_list is
 ?X:    irrelevant for earlier versions.
 ?X:
-?MAKE:perl5: path_sep binexp test sed
+?MAKE:perl5: path_sep binexp test sed exe_ext
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:perl5:
@@ -25,13 +25,13 @@
 : Find perl5.005 or later.
 echo "Looking for a previously installed perl5.005 or later... "
 case "$perl5" in
-'')    for tdir in `echo "$binexp:$PATH" | $sed "s/$path_sep/ /g"`; do
+'')    for tdir in `echo "$binexp$path_sep$PATH" | $sed "s/$path_sep/ /g"`; do
                : Check if this perl is recent and can load a simple module
-               if $test -x $tdir/perl && $tdir/perl -Mless -e 'use 5.005;' >/dev/null 2>&1; then
+               if $test -x $tdir/perl$exe_ext && $tdir/perl -Mless -e 'use 5.005;' >/dev/null 2>&1; then
                        perl5=$tdir/perl
                        break;
-               elif $test -x $tdir/perl5 && $tdir/perl5 -Mless -e 'use 5.005;' >/dev/null 2>&1; then
-                       perl5=$tdir/perl
+               elif $test -x $tdir/perl5$exe_ext && $tdir/perl5 -Mless -e 'use 5.005;' >/dev/null 2>&1; then
+                       perl5=$tdir/perl5
                        break;
                fi
        done

diff --git a/U/installdirs/siteman1.U b/U/installdirs/siteman1.U
index 1487a19..c267ade 100644 (file)
--- a/U/installdirs/siteman1.U
+++ b/U/installdirs/siteman1.U
@@ -33,6 +33,7 @@
 ?S:    man1direxp only points to the read-only access location. For extra
 ?S:    portability, you should only use this variable within your makefiles.
 ?S:.
+?INIT:siteman1=''
 : determine where add-on manual pages go
 case "$siteman1" in
 '')    dflt=`echo "$man1dir" | $sed "s#^$prefix#$siteprefix#"` ;;

diff --git a/U/installdirs/siteman3.U b/U/installdirs/siteman3.U
index 42086d2..177be22 100644 (file)
--- a/U/installdirs/siteman3.U
+++ b/U/installdirs/siteman3.U
@@ -33,6 +33,7 @@
 ?S:    man3direxp only points to the read-only access location. For extra
 ?S:    portability, you should only use this variable within your makefiles.
 ?S:.
+?INIT:siteman3=''
 : determine where add-on library man pages go
 case "$siteman3" in
 '')    dflt=`echo "$man3dir" | $sed "s#^$prefix#$siteprefix#"` ;;

diff --git a/U/installdirs/sitescript.U b/U/installdirs/sitescript.U
index 962384c..4fab9ab 100644 (file)
--- a/U/installdirs/sitescript.U
+++ b/U/installdirs/sitescript.U
@@ -34,6 +34,7 @@
 ?S:    a system running AFS, in which case they may differ slightly. You
 ?S:    should always use this variable within your makefiles for portability.
 ?S:.
+?INIT:sitescript=''
 : determine where add-on public executable scripts go
 case "$sitescript" in
 '')    dflt=$siteprefix/script

diff --git a/U/modified/Signal.U b/U/modified/Signal.U
index 6a469b8..d8f8a92 100644 (file)
--- a/U/modified/Signal.U
+++ b/U/modified/Signal.U
@@ -55,7 +55,7 @@ else
        xxx=`echo '#include <signal.h>' |
        $cppstdin $cppminus $cppflags 2>/dev/null |
        $grep '^[       ]*#.*include' | 
-       $awk "{print \\$$fieldn}" | $sed 's!"!!g' | $sort | $uniq`
+       $awk "{print \\$$fieldn}" | $sed 's!"!!g' | $sed 's!\\\\\\\\!/!g' | $sort | $uniq`
 fi
 : Check this list of files to be sure we have parsed the cpp output ok.
 : This will also avoid potentially non-existent files, such