[M3commit] unresolve order TARGET vs. INSTALL_ROOT

[Jay K]

This was already ahead of the tag, so not sure what to do. (I wish we could add to the original mail subject lines..like take the first line of the commit comment.)


jbook2:cm3 jay$ cvs -z3 diff -u
cvs diff: Diffing .
cvs diff: Diffing src
Index: src/M3Build.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-sys/cm3/src/M3Build.m3,v
retrieving revision 1.28.2.11
diff -u -r1.28.2.11 M3Build.m3
--- src/M3Build.m3    17 Apr 2010 05:32:28 -0000    1.28.2.11
+++ src/M3Build.m3    21 Apr 2010 14:50:36 -0000
@@ -1899,8 +1899,17 @@
     res := TextUtils.Substitute(res, t.emacs_install_alt, "\" & EMACS_INSTALL & \"");
     res := TextUtils.Substitute(res, t.pkg_install_alt, "\" & PKG_INSTALL & \"");
     res := TextUtils.Substitute(res, t.pkg_use_alt, "\" & PKG_USE & \"");
-    res := TextUtils.Substitute(res, t.text_build_dir, "\" & TARGET & \"");
+    
+    (* INSTALL_ROOT needs to be relatively late since it is a prefix of others.
+     * TARGET needs to be even later since it can occur arbitrarily, as in:
+     * e.g. /Users/hudson/workspace/makedist-AMD64_DARWIN/bin
+     *                                       ^--TARGET--^
+     *      ^--------------------------- INSTALL_ROOT --^
+     *      ^--------------------------- BIN_INSTALL  ------^
+     *)
     res := TextUtils.Substitute(res, t.install_root_alt, "\" & INSTALL_ROOT & \"");
+    res := TextUtils.Substitute(res, t.text_build_dir, "\" & TARGET & \"");
+
     res := TextUtils.Substitute(res, "\"\" & ", "");
     res := TextUtils.Substitute(res, " & \"\"", "");
     RETURN res;

 - Jay


----------------------------------------
> Date: Wed, 21 Apr 2010 16:52:33 +0000
> To: m3commit at elegosoft.com
> From: jkrell at elego.de
> Subject: [M3commit] CVS Update: cm3
>
> CVSROOT: /usr/cvs
> Changes by: jkrell at birch. 10/04/21 16:52:33
>
> Modified files:
> cm3/m3-sys/cm3/src/: Tag: release_branch_cm3_5_8 M3Build.m3
>
> Log message:
> TARGET must be back-substituted later, after INSTALL_ROOT, Olaf
> correctly points out.
>