Last backport to get in sync withe reality. This was from #27491

p4raw-id: //depot/metaconfig@27683

diff --git a/U/installdirs/bin.U b/U/installdirs/bin.U
index cc432d4..1cbdf30 100644 (file)
--- a/U/installdirs/bin.U
+++ b/U/installdirs/bin.U
@@ -27,12 +27,14 @@
 ?RCS: Revision 3.0  1993/08/18  12:05:26  ram
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
-?MAKE:bin binexp installbin userelocatableinc: Myread Prefixit Getfile \
-       Setvar Setprefixvar Oldconfig test prefix prefixexp
+?MAKE:bin binexp installbin userelocatableinc initialinstalllocation: \
+       Myread Prefixit Getfile Setvar Setprefixvar Oldconfig \
+       test prefix prefixexp
 ?MAKE: -pick add $@ %<
 ?LINT:change prefix
 ?LINT:change prefixexp
 ?LINT:change prefixvar
+?LINT:change installprefixexp
 ?Y:TOP
 ?D:bin=''
 ?S:bin:
@@ -60,6 +62,9 @@
 ?S:    containing the perl binary, and a logical cleanup of the path is then
 ?S:    made around the join point (removing "dir/../" pairs)
 ?S:.
+?S:initialinstalllocation:
+?S:    The initial install location.
+?S:.
 ?C:BIN:
 ?C:    This symbol holds the path of the bin directory where the package will
 ?C:    be installed. Program must be prepared to deal with ~name substitution.
@@ -116,8 +121,12 @@ eval $setvar
 : Default prefix is now "up one level from where the binaries are"
 case "$userelocatableinc" in
 $define|true|[yY]*)
+    initialinstalllocation="$binexp"
+    bin=".../"
+    binexp=".../"
     prefix=".../.."
     prefixexp=".../.."
+    installprefixexp=".../.."
     ;;
 esac