Backport #27484

p4raw-id: //depot/metaconfig@27655

diff --git a/U/installdirs/archlib.U b/U/installdirs/archlib.U
index 8bdc520..fa28887 100644 (file)
--- a/U/installdirs/archlib.U
+++ b/U/installdirs/archlib.U
@@ -30,9 +30,9 @@
 ?RCS: patch36: created by ADO
 ?RCS:
 ?MAKE:d_archlib archlib archlibexp installarchlib: \
-       archname spackage prefix \
+       archname spackage prefix prefixexp \
        cat Getfile Loc Oldconfig privlib sed test \
-       Prefixit Prefixup installprefix
+       Prefixit Prefixup installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:d_archlib:
@@ -107,7 +107,7 @@ else
 fi
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installarchlib=`echo $archlibexp | sed "s#^$prefix#$installprefix#"`
+       installarchlib=`echo $archlibexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installarchlib="$archlibexp"
 fi

diff --git a/U/installdirs/bin.U b/U/installdirs/bin.U
index fef982e..6645bb7 100644 (file)
--- a/U/installdirs/bin.U
+++ b/U/installdirs/bin.U
@@ -27,7 +27,8 @@
 ?RCS: Revision 3.0  1993/08/18  12:05:26  ram
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
-?MAKE:bin binexp installbin: Prefixit prefix installprefix \
+?MAKE:bin binexp installbin: Prefixit prefix prefixexp \
+       installprefix installprefixexp \
        Getfile Oldconfig test
 ?MAKE: -pick add $@ %<
 ?Y:TOP
@@ -73,7 +74,7 @@ binexp="$ansexp"
 : Change installation prefix, if necessary.
 : XXX Bug? -- ignores Configure -Dinstallprefix setting.
 if $test X"$prefix" != X"$installprefix"; then
-       installbin=`echo $binexp | sed "s#^$prefix#$installprefix#"`
+       installbin=`echo $binexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installbin="$binexp"
 fi

diff --git a/U/installdirs/html1dir.U b/U/installdirs/html1dir.U
index a12d313..ff5215a 100644 (file)
--- a/U/installdirs/html1dir.U
+++ b/U/installdirs/html1dir.U
@@ -12,7 +12,7 @@
 ?RCS:
 ?MAKE:html1dir html1direxp installhtml1dir: cat Loc \
        spackage test Getfile Prefixit Prefixup Myread \
-       prefix installprefix
+       prefix prefixexp installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:html1dir:
@@ -53,7 +53,7 @@ html1direxp="$ansexp"
 $test X"$html1dir" = "X" && html1dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installhtml1dir=`echo $html1direxp | sed "s#^$prefix#$installprefix#"`
+       installhtml1dir=`echo $html1direxp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installhtml1dir="$html1direxp"
 fi

diff --git a/U/installdirs/html3dir.U b/U/installdirs/html3dir.U
index 13e06c8..68b4ece 100644 (file)
--- a/U/installdirs/html3dir.U
+++ b/U/installdirs/html3dir.U
@@ -12,7 +12,7 @@
 ?RCS:
 ?MAKE:html3dir html3direxp installhtml3dir: cat sed Loc \
        spackage test Getfile Prefixit Prefixup Myread \
-       prefix installprefix html1dir
+       prefix prefixexp installprefix installprefixexp html1dir
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:html3dir:
@@ -54,7 +54,7 @@ html3direxp="$ansexp"
 $test X"$html3dir" = "X" && html3dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installhtml3dir=`echo $html3direxp | sed "s#^$prefix#$installprefix#"`
+       installhtml3dir=`echo $html3direxp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installhtml3dir="$html3direxp"
 fi

diff --git a/U/installdirs/man1dir.U b/U/installdirs/man1dir.U
index 6ba7512..a8aafa7 100644 (file)
--- a/U/installdirs/man1dir.U
+++ b/U/installdirs/man1dir.U
@@ -26,8 +26,8 @@
 ?X:    man1 used instead of man everywhere.
 ?X:
 ?MAKE:man1dir man1direxp man1ext installman1dir: cat nroff Loc Oldconfig \
-       spackage test Getfile Prefixit prefixexp Prefixup sysman Myread \
-       prefix installprefix sed
+       spackage test Getfile Prefixit Prefixup sysman Myread \
+       prefix prefixexp installprefix installprefixexp sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:man1dir:
@@ -106,7 +106,7 @@ esac
 
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installman1dir=`echo $man1direxp | $sed "s#^$prefix#$installprefix#"`
+       installman1dir=`echo $man1direxp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installman1dir="$man1direxp"
 fi

diff --git a/U/installdirs/man3dir.U b/U/installdirs/man3dir.U
index ff17802..1a3dece 100644 (file)
--- a/U/installdirs/man3dir.U
+++ b/U/installdirs/man3dir.U
@@ -25,8 +25,8 @@
 ?X:    pages with long file names. -- ADO
 ?X:
 ?MAKE:man3dir man3direxp man3ext installman3dir: cat nroff Loc Oldconfig \
-       sed man1dir spackage package Getfile prefix Prefixit Prefixup \
-       installprefix d_flexfnam privlib Myread test
+       sed man1dir spackage package Getfile prefix prefixexp Prefixit Prefixup \
+       installprefix installprefixexp d_flexfnam privlib Myread test
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:man3dir:
@@ -129,7 +129,7 @@ esac
 
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installman3dir=`echo $man3direxp | $sed "s#^$prefix#$installprefix#"`
+       installman3dir=`echo $man3direxp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installman3dir="$man3direxp"
 fi

diff --git a/U/installdirs/privlib.U b/U/installdirs/privlib.U
index 439efb3..e897ab9 100644 (file)
--- a/U/installdirs/privlib.U
+++ b/U/installdirs/privlib.U
@@ -30,8 +30,8 @@
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
 ?MAKE:privlib privlibexp installprivlib: package cat Getfile \
-       Oldconfig prefix installprefix Prefixit test version \
-       installstyle
+       Oldconfig prefix prefixexp installprefix installprefixexp \
+       Prefixit test version installstyle
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:privlib:
@@ -85,7 +85,7 @@ privlib="$ans"
 privlibexp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installprivlib=`echo $privlibexp | sed "s#^$prefix#$installprefix#"`
+       installprivlib=`echo $privlibexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installprivlib="$privlibexp"
 fi

diff --git a/U/installdirs/scriptdir.U b/U/installdirs/scriptdir.U
index 68960d3..dfe94aa 100644 (file)
--- a/U/installdirs/scriptdir.U
+++ b/U/installdirs/scriptdir.U
@@ -25,8 +25,8 @@
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
 ?MAKE:scriptdir scriptdirexp installscript: cat test Getfile Loc \
-       Oldconfig +bin sed \
-       Prefixit prefixexp prefix installprefix Prefixup
+       Oldconfig +bin sed Prefixit prefix prefixexp \
+       installprefix installprefixexp Prefixup
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:scriptdir:
@@ -95,7 +95,7 @@ scriptdir="$ans"
 scriptdirexp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installscript=`echo $scriptdirexp | sed "s#^$prefix#$installprefix#"`
+       installscript=`echo $scriptdirexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installscript="$scriptdirexp"
 fi

diff --git a/U/installdirs/sitearch.U b/U/installdirs/sitearch.U
index ba437ae..c76d9eb 100644 (file)
--- a/U/installdirs/sitearch.U
+++ b/U/installdirs/sitearch.U
@@ -17,8 +17,8 @@
 ?RCS: patch61: created
 ?RCS:
 ?MAKE:sitearch sitearchexp installsitearch: cat sed Getfile \
-       Oldconfig Prefixit archname installprefix \
-       prefix sitelib test
+       Oldconfig Prefixit archname installprefix installprefixexp \
+       prefix prefixexp sitelib test
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitearch:
@@ -85,7 +85,7 @@ sitearch="$ans"
 sitearchexp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitearch=`echo $sitearchexp | sed "s#^$prefix#$installprefix#"`
+       installsitearch=`echo $sitearchexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitearch="$sitearchexp"
 fi

diff --git a/U/installdirs/sitebin.U b/U/installdirs/sitebin.U
index 522054e..c38c700 100644 (file)
--- a/U/installdirs/sitebin.U
+++ b/U/installdirs/sitebin.U
@@ -11,7 +11,7 @@
 ?RCS: $Log: sitebin.U,v $
 ?RCS:
 ?MAKE:sitebin sitebinexp installsitebin : Getfile Oldconfig siteprefix test \
-       installprefix prefix
+       installprefix installprefixexp prefix prefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitebin:
@@ -46,7 +46,7 @@ sitebin="$ans"
 sitebinexp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitebin=`echo $sitebinexp | sed "s#^$prefix#$installprefix#"`
+       installsitebin=`echo $sitebinexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitebin="$sitebinexp"
 fi

diff --git a/U/installdirs/sitehtml1.U b/U/installdirs/sitehtml1.U
index ad8dba0..0504831 100644 (file)
--- a/U/installdirs/sitehtml1.U
+++ b/U/installdirs/sitehtml1.U
@@ -9,7 +9,7 @@
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?MAKE:sitehtml1 sitehtml1exp installsitehtml1: test Getfile \
-       prefix installprefix siteprefix html1dir sed
+       prefix prefixexp installprefix installprefixexp siteprefix html1dir sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitehtml1:
@@ -52,7 +52,7 @@ sitehtml1exp="$ansexp"
 $test X"$sitehtml1" = "X" && sitehtml1=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitehtml1=`echo "$sitehtml1exp" | $sed "s#^$prefix#$installprefix#"`
+       installsitehtml1=`echo "$sitehtml1exp" | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitehtml1="$sitehtml1exp"
 fi

diff --git a/U/installdirs/sitehtml1dir.U b/U/installdirs/sitehtml1dir.U
index 21e5db6..ec81723 100644 (file)
--- a/U/installdirs/sitehtml1dir.U
+++ b/U/installdirs/sitehtml1dir.U
@@ -9,7 +9,7 @@
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?MAKE:sitehtml1dir sitehtml1direxp installsitehtml1dir: test Getfile \
-       prefix installprefix siteprefix html1dir sed
+       prefix prefixexp installprefix installprefixexp siteprefix html1dir sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitehtml1dir:
@@ -50,7 +50,7 @@ sitehtml1dir="$ans"
 sitehtml1direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitehtml1dir=`echo $sitehtml1direxp | $sed "s#^$prefix#$installprefix#"`
+       installsitehtml1dir=`echo $sitehtml1direxp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitehtml1dir="$sitehtml1direxp"
 fi

diff --git a/U/installdirs/sitehtml3.U b/U/installdirs/sitehtml3.U
index 65a0d0e..3df543c 100644 (file)
--- a/U/installdirs/sitehtml3.U
+++ b/U/installdirs/sitehtml3.U
@@ -9,7 +9,7 @@
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?MAKE:sitehtml3 sitehtml3exp installsitehtml3: test Getfile \
-       prefix installprefix siteprefix html3dir sed
+       prefix prefixexp installprefix installprefixexp siteprefix html3dir sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitehtml3:
@@ -52,7 +52,7 @@ sitehtml3exp="$ansexp"
 $test X"$sitehtml3" = "X" && sitehtml3=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitehtml3=`echo "$sitehtml3exp" | $sed "s#^$prefix#$installprefix#"`
+       installsitehtml3=`echo "$sitehtml3exp" | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitehtml3="$sitehtml3exp"
 fi

diff --git a/U/installdirs/sitehtml3dir.U b/U/installdirs/sitehtml3dir.U
index ba719ac..95e3a18 100644 (file)
--- a/U/installdirs/sitehtml3dir.U
+++ b/U/installdirs/sitehtml3dir.U
@@ -9,7 +9,7 @@
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?MAKE:sitehtml3dir sitehtml3direxp installsitehtml3dir: test Getfile \
-       prefix installprefix siteprefix html3dir sed
+       prefix prefixexp installprefix installprefixexp siteprefix html3dir sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitehtml3dir:
@@ -50,7 +50,7 @@ sitehtml3dir="$ans"
 sitehtml3direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitehtml3dir=`echo $sitehtml3direxp | $sed "s#^$prefix#$installprefix#"`
+       installsitehtml3dir=`echo $sitehtml3direxp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitehtml3dir="$sitehtml3direxp"
 fi

diff --git a/U/installdirs/sitelib.U b/U/installdirs/sitelib.U
index 06753a5..5b2a17c 100644 (file)
--- a/U/installdirs/sitelib.U
+++ b/U/installdirs/sitelib.U
@@ -17,8 +17,8 @@
 ?RCS: patch61: created
 ?RCS:
 ?MAKE:sitelib sitelibexp installsitelib sitelib_stem: cat Getfile \
-       Oldconfig Prefixit package installprefix prefix \
-       version test sed installstyle siteprefix
+       Oldconfig Prefixit package installprefix installprefixexp \
+       prefix prefixexp version test sed installstyle siteprefix
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitelib:
@@ -102,7 +102,7 @@ sitelibexp="$ansexp"
 sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitelib=`echo $sitelibexp | $sed "s#^$prefix#$installprefix#"`
+       installsitelib=`echo $sitelibexp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitelib="$sitelibexp"
 fi

diff --git a/U/installdirs/siteman1.U b/U/installdirs/siteman1.U
index c267ade..60fa108 100644 (file)
--- a/U/installdirs/siteman1.U
+++ b/U/installdirs/siteman1.U
@@ -9,7 +9,7 @@
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?MAKE:siteman1 siteman1exp installsiteman1: test Getfile \
-       prefix installprefix siteprefix man1dir sed
+       prefix prefixexp installprefix installprefixexp siteprefix man1dir sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:siteman1:
@@ -51,7 +51,7 @@ siteman1exp="$ansexp"
 $test X"$siteman1" = "X" && siteman1=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsiteman1=`echo "$siteman1exp" | $sed "s#^$prefix#$installprefix#"`
+       installsiteman1=`echo "$siteman1exp" | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsiteman1="$siteman1exp"
 fi

diff --git a/U/installdirs/siteman1dir.U b/U/installdirs/siteman1dir.U
index 07ce6fa..80c05fe 100644 (file)
--- a/U/installdirs/siteman1dir.U
+++ b/U/installdirs/siteman1dir.U
@@ -9,7 +9,7 @@
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?MAKE:siteman1dir siteman1direxp installsiteman1dir: test Getfile \
-       prefix installprefix siteprefix man1dir sed
+       prefix prefixexp installprefix installprefixexp siteprefix man1dir sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:siteman1dir:
@@ -49,7 +49,7 @@ siteman1dir="$ans"
 siteman1direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsiteman1dir=`echo $siteman1direxp | $sed "s#^$prefix#$installprefix#"`
+       installsiteman1dir=`echo $siteman1direxp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsiteman1dir="$siteman1direxp"
 fi

diff --git a/U/installdirs/siteman3.U b/U/installdirs/siteman3.U
index 177be22..6c4821e 100644 (file)
--- a/U/installdirs/siteman3.U
+++ b/U/installdirs/siteman3.U
@@ -9,7 +9,7 @@
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?MAKE:siteman3 siteman3exp installsiteman3: test Getfile \
-       prefix installprefix siteprefix man3dir sed
+       prefix prefixexp installprefix installprefixexp siteprefix man3dir sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:siteman3:
@@ -51,7 +51,7 @@ siteman3exp="$ansexp"
 $test X"$siteman3" = "X" && siteman3=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsiteman3=`echo "$siteman3exp" | $sed "s#^$prefix#$installprefix#"`
+       installsiteman3=`echo "$siteman3exp" | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsiteman3="$siteman3exp"
 fi

diff --git a/U/installdirs/siteman3dir.U b/U/installdirs/siteman3dir.U
index 6321404..8213f38 100644 (file)
--- a/U/installdirs/siteman3dir.U
+++ b/U/installdirs/siteman3dir.U
@@ -9,7 +9,7 @@
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?MAKE:siteman3dir siteman3direxp installsiteman3dir: test Getfile \
-       prefix installprefix siteprefix man3dir sed
+       prefix prefixexp installprefix installprefixexp siteprefix man3dir sed
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:siteman3dir:
@@ -49,7 +49,7 @@ siteman3dir="$ans"
 siteman3direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsiteman3dir=`echo $siteman3direxp | $sed "s#^$prefix#$installprefix#"`
+       installsiteman3dir=`echo $siteman3direxp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsiteman3dir="$siteman3direxp"
 fi

diff --git a/U/installdirs/sitescript.U b/U/installdirs/sitescript.U
index 4fab9ab..b3db915 100644 (file)
--- a/U/installdirs/sitescript.U
+++ b/U/installdirs/sitescript.U
@@ -11,7 +11,7 @@
 ?RCS: $Log: sitescript.U,v $
 ?RCS:
 ?MAKE:sitescript sitescriptexp installsitescript : Getfile Oldconfig test \
-       sitebin prefix siteprefix sed installprefix
+       sitebin prefix prefixexp siteprefix sed installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitescript:
@@ -48,7 +48,7 @@ sitescript="$ans"
 sitescriptexp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitescript=`echo $sitescriptexp | sed "s#^$prefix#$installprefix#"`
+       installsitescript=`echo $sitescriptexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitescript="$sitescriptexp"
 fi

diff --git a/U/installdirs/sitescriptdir.U b/U/installdirs/sitescriptdir.U
index d38c5c5..37ebaf4 100644 (file)
--- a/U/installdirs/sitescriptdir.U
+++ b/U/installdirs/sitescriptdir.U
@@ -10,8 +10,9 @@
 ?RCS:
 ?RCS: $Log: sitescriptdir.U,v $
 ?RCS:
-?MAKE:sitescriptdir sitescriptdirexp installsitescriptdir : Getfile Oldconfig test \
-       scriptdir prefix siteprefix sed installprefix
+?MAKE:sitescriptdir sitescriptdirexp installsitescriptdir : Getfile \
+       Oldconfig test scriptdir prefix prefixexp siteprefix sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:sitescriptdir:
@@ -46,7 +47,7 @@ sitescriptdir="$ans"
 sitescriptdirexp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installsitescriptdir=`echo $sitescriptdirexp | sed "s#^$prefix#$installprefix#"`
+       installsitescriptdir=`echo $sitescriptdirexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installsitescriptdir="$sitescriptdirexp"
 fi

diff --git a/U/installdirs/vendorarch.U b/U/installdirs/vendorarch.U
index a0fc812..0c5b813 100644 (file)
--- a/U/installdirs/vendorarch.U
+++ b/U/installdirs/vendorarch.U
@@ -15,7 +15,7 @@
 ?RCS:
 ?MAKE:d_vendorarch vendorarch vendorarchexp installvendorarch: sed Getfile \
        Oldconfig Prefixit test archname vendorlib \
-       vendorprefix prefix installprefix
+       vendorprefix prefix prefixexp installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorarch:
@@ -82,7 +82,7 @@ case "$vendorprefix" in
 esac
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorarch=`echo $vendorarchexp | sed "s#^$prefix#$installprefix#"`
+       installvendorarch=`echo $vendorarchexp | sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorarch="$vendorarchexp"
 fi

diff --git a/U/installdirs/vendorbin.U b/U/installdirs/vendorbin.U
index 2edb279..0f668d5 100644 (file)
--- a/U/installdirs/vendorbin.U
+++ b/U/installdirs/vendorbin.U
@@ -14,7 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:d_vendorbin vendorbin vendorbinexp installvendorbin: Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorbin:
@@ -75,7 +76,7 @@ case "$vendorprefix" in
 esac
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorbin=`echo $vendorbinexp | $sed "s#^$prefix#$installprefix#"`
+       installvendorbin=`echo $vendorbinexp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorbin="$vendorbinexp"
 fi

diff --git a/U/installdirs/vendorhtml1.U b/U/installdirs/vendorhtml1.U
index a22daa4..a4d0149 100644 (file)
--- a/U/installdirs/vendorhtml1.U
+++ b/U/installdirs/vendorhtml1.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:vendorhtml1 vendorhtml1exp installvendorhtml1: html1dir Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed \
-       installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorhtml1:
@@ -62,7 +62,7 @@ esac
 $test X"$vendorhtml1" = "X" && vendorhtml1=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorhtml1=`echo $vendorhtml1exp | $sed "s#^$prefix#$installprefix#"`
+       installvendorhtml1=`echo $vendorhtml1exp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorhtml1="$vendorhtml1exp"
 fi

diff --git a/U/installdirs/vendorhtml1dir.U b/U/installdirs/vendorhtml1dir.U
index 9aa428b..05acb0d 100644 (file)
--- a/U/installdirs/vendorhtml1dir.U
+++ b/U/installdirs/vendorhtml1dir.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:vendorhtml1dir vendorhtml1direxp installvendorhtml1dir: html1dir Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed \
-       installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorhtml1dir:
@@ -62,7 +62,7 @@ esac
 $test X"$vendorhtml1dir" = "X" && vendorhtml1dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorhtml1dir=`echo $vendorhtml1direxp | $sed "s#^$prefix#$installprefix#"`
+       installvendorhtml1dir=`echo $vendorhtml1direxp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorhtml1dir="$vendorhtml1direxp"
 fi

diff --git a/U/installdirs/vendorhtml3.U b/U/installdirs/vendorhtml3.U
index 72b7c00..8cfc626 100644 (file)
--- a/U/installdirs/vendorhtml3.U
+++ b/U/installdirs/vendorhtml3.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:vendorhtml3 vendorhtml3exp installvendorhtml3: html3dir Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed \
-       installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorhtml3:
@@ -62,7 +62,7 @@ esac
 $test X"$vendorhtml3" = "X" && vendorhtml3=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorhtml3=`echo $vendorhtml3exp | $sed "s#^$prefix#$installprefix#"`
+       installvendorhtml3=`echo $vendorhtml3exp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorhtml3="$vendorhtml3exp"
 fi

diff --git a/U/installdirs/vendorhtml3dir.U b/U/installdirs/vendorhtml3dir.U
index 444c834..8b16250 100644 (file)
--- a/U/installdirs/vendorhtml3dir.U
+++ b/U/installdirs/vendorhtml3dir.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:vendorhtml3dir vendorhtml3direxp installvendorhtml3dir: html3dir Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed \
-       installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorhtml3dir:
@@ -62,7 +62,7 @@ esac
 $test X"$vendorhtml3dir" = "X" && vendorhtml3dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorhtml3dir=`echo $vendorhtml3direxp | $sed "s#^$prefix#$installprefix#"`
+       installvendorhtml3dir=`echo $vendorhtml3direxp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorhtml3dir="$vendorhtml3direxp"
 fi

diff --git a/U/installdirs/vendorlib.U b/U/installdirs/vendorlib.U
index a99ffdc..554a202 100644 (file)
--- a/U/installdirs/vendorlib.U
+++ b/U/installdirs/vendorlib.U
@@ -15,8 +15,8 @@
 ?RCS:
 ?MAKE:d_vendorlib vendorlib vendorlibexp installvendorlib \
        vendorlib_stem: Getfile \
-       Oldconfig Prefixit test package vendorprefix prefix sed \
-       installstyle installprefix version
+       Oldconfig Prefixit test package vendorprefix prefix prefixexp sed \
+       installstyle installprefix installprefixexp version
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorlib:
@@ -100,7 +100,7 @@ esac
 vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorlib=`echo $vendorlibexp | $sed "s#^$prefix#$installprefix#"`
+       installvendorlib=`echo $vendorlibexp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorlib="$vendorlibexp"
 fi

diff --git a/U/installdirs/vendorman1.U b/U/installdirs/vendorman1.U
index 7ac197c..41f0448 100644 (file)
--- a/U/installdirs/vendorman1.U
+++ b/U/installdirs/vendorman1.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:vendorman1 vendorman1exp installvendorman1: man1dir Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed \
-       installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorman1:
@@ -59,7 +59,7 @@ esac
 $test X"$vendorman1" = "X" && vendorman1=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorman1=`echo "$vendorman1exp" | $sed "s#^$prefix#$installprefix#"`
+       installvendorman1=`echo "$vendorman1exp" | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorman1="$vendorman1exp"
 fi

diff --git a/U/installdirs/vendorman1dir.U b/U/installdirs/vendorman1dir.U
index 8197de7..894e71a 100644 (file)
--- a/U/installdirs/vendorman1dir.U
+++ b/U/installdirs/vendorman1dir.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:vendorman1dir vendorman1direxp installvendorman1dir: man1dir Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed \
-       installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorman1dir:
@@ -59,7 +59,7 @@ esac
 $test X"$vendorman1dir" = "X" && vendorman1dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorman1dir=`echo "$vendorman1direxp" | $sed "s#^$prefix#$installprefix#"`
+       installvendorman1dir=`echo "$vendorman1direxp" | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorman1dir="$vendorman1direxp"
 fi

diff --git a/U/installdirs/vendorman3.U b/U/installdirs/vendorman3.U
index 42fda7f..0231dfc 100644 (file)
--- a/U/installdirs/vendorman3.U
+++ b/U/installdirs/vendorman3.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:vendorman3 vendorman3exp installvendorman3: man3dir Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed \
-       installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorman3:
@@ -59,7 +59,7 @@ esac
 $test X"$vendorman3" = "X" && vendorman3=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorman3=`echo "$vendorman3exp" | $sed "s#^$prefix#$installprefix#"`
+       installvendorman3=`echo "$vendorman3exp" | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorman3="$vendorman3exp"
 fi

diff --git a/U/installdirs/vendorman3dir.U b/U/installdirs/vendorman3dir.U
index b226884..7965739 100644 (file)
--- a/U/installdirs/vendorman3dir.U
+++ b/U/installdirs/vendorman3dir.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:vendorman3dir vendorman3direxp installvendorman3dir: man3dir Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed \
-       installprefix
+       Oldconfig Prefixit test vendorprefix prefix prefixexp sed \
+       installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorman3dir:
@@ -59,7 +59,7 @@ esac
 $test X"$vendorman3dir" = "X" && vendorman3dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorman3dir=`echo "$vendorman3direxp" | $sed "s#^$prefix#$installprefix#"`
+       installvendorman3dir=`echo "$vendorman3direxp" | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorman3dir="$vendorman3direxp"
 fi

diff --git a/U/installdirs/vendorscript.U b/U/installdirs/vendorscript.U
index 4dbcfa0..bb9c7fe 100644 (file)
--- a/U/installdirs/vendorscript.U
+++ b/U/installdirs/vendorscript.U
@@ -14,8 +14,8 @@
 ?RCS:
 ?RCS:
 ?MAKE:d_vendorscript vendorscript vendorscriptexp installvendorscript: \
-       vendorbin cat Getfile \
-       Oldconfig Prefixit test vendorprefix prefix sed installprefix
+       vendorbin cat Getfile Oldconfig Prefixit test vendorprefix \
+       prefix prefixexp sed installprefix installprefixexp
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:vendorscript:
@@ -83,7 +83,7 @@ EOM
 esac
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-       installvendorscript=`echo $vendorscriptexp | $sed "s#^$prefix#$installprefix#"`
+       installvendorscript=`echo $vendorscriptexp | $sed "s#^$prefixexp#$installprefixexp#"`
 else
        installvendorscript="$vendorscriptexp"
 fi