diff --git a/src/boot/be/abi.ml b/src/boot/be/abi.ml
index 023e1e1df203..150f4cc229ad 100644
--- a/src/boot/be/abi.ml
+++ b/src/boot/be/abi.ml
@@ -247,6 +247,6 @@ let load_fixup_codeptr
  * fill-column: 78; 
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; 
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; 
  * End:
  *)
diff --git a/src/boot/be/asm.ml b/src/boot/be/asm.ml
index 939b297cfe92..f8284beffa07 100644
--- a/src/boot/be/asm.ml
+++ b/src/boot/be/asm.ml
@@ -826,6 +826,6 @@ let read_rust_note (ar:asm_reader) : (Ast.ident * string) array =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/be/elf.ml b/src/boot/be/elf.ml
index 99b680427d36..9ca1b3b6f886 100644
--- a/src/boot/be/elf.ml
+++ b/src/boot/be/elf.ml
@@ -1779,6 +1779,6 @@ let get_sections
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/be/il.ml b/src/boot/be/il.ml
index 9a63576e414a..1539c00b87ca 100644
--- a/src/boot/be/il.ml
+++ b/src/boot/be/il.ml
@@ -932,6 +932,6 @@ let ptr_cast (cell:cell) (rty:referent_ty) : cell =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/be/macho.ml b/src/boot/be/macho.ml
index 5d02b2c22fac..61b1514eed19 100644
--- a/src/boot/be/macho.ml
+++ b/src/boot/be/macho.ml
@@ -1189,6 +1189,6 @@ let get_sections
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/be/pe.ml b/src/boot/be/pe.ml
index b85cb1a95d67..296d0ace51ef 100644
--- a/src/boot/be/pe.ml
+++ b/src/boot/be/pe.ml
@@ -1170,6 +1170,6 @@ let get_sections
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/be/ra.ml b/src/boot/be/ra.ml
index 66da80939231..dca2c0b64eaa 100644
--- a/src/boot/be/ra.ml
+++ b/src/boot/be/ra.ml
@@ -683,6 +683,6 @@ let reg_alloc
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/be/x86.ml b/src/boot/be/x86.ml
index 49b660be5aef..949df5c95026 100644
--- a/src/boot/be/x86.ml
+++ b/src/boot/be/x86.ml
@@ -2577,6 +2577,6 @@ let frags_of_emitted_quads (sess:Session.sess) (e:Il.emitter) : Asm.frag =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/driver/glue.ml b/src/boot/driver/glue.ml
index 4fc7448054df..fa7bee2f8593 100644
--- a/src/boot/driver/glue.ml
+++ b/src/boot/driver/glue.ml
@@ -10,7 +10,7 @@ let alt_pipeline _ _ _ = ();;
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
 
diff --git a/src/boot/driver/lib.ml b/src/boot/driver/lib.ml
index 00b1b8341f51..113ed08643d3 100644
--- a/src/boot/driver/lib.ml
+++ b/src/boot/driver/lib.ml
@@ -459,6 +459,6 @@ let infer_lib_name
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/driver/main.ml b/src/boot/driver/main.ml
index ddcbc9afd707..44586be3f9fa 100644
--- a/src/boot/driver/main.ml
+++ b/src/boot/driver/main.ml
@@ -529,6 +529,6 @@ then Gc.print_stat stdout;;
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/driver/session.ml b/src/boot/driver/session.ml
index 0b02096f2ced..ac56f855b81c 100644
--- a/src/boot/driver/session.ml
+++ b/src/boot/driver/session.ml
@@ -145,6 +145,6 @@ let make_crate_id (sess:sess) : crate_id =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/ast.ml b/src/boot/fe/ast.ml
index 5e814af3af58..8ea03a63ceb0 100644
--- a/src/boot/fe/ast.ml
+++ b/src/boot/fe/ast.ml
@@ -1826,6 +1826,6 @@ let sprintf_stmt = sprintf_fmt fmt_stmt_body;;
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/cexp.ml b/src/boot/fe/cexp.ml
index 0f216fc29937..a0db67738013 100644
--- a/src/boot/fe/cexp.ml
+++ b/src/boot/fe/cexp.ml
@@ -766,6 +766,6 @@ let parse_src_file
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/extfmt.ml b/src/boot/fe/extfmt.ml
index 8b0b149abc34..6b0bd7882ea5 100644
--- a/src/boot/fe/extfmt.ml
+++ b/src/boot/fe/extfmt.ml
@@ -224,6 +224,6 @@ let parse_fmt_string (s:string) : piece array =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/fuzz.ml b/src/boot/fe/fuzz.ml
index 2c465be4f3bd..d93c36577b1d 100644
--- a/src/boot/fe/fuzz.ml
+++ b/src/boot/fe/fuzz.ml
@@ -161,6 +161,6 @@ let fuzz (seed:int option) (sess:Session.sess) : unit =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/item.ml b/src/boot/fe/item.ml
index 6cee87963e7f..fce8937343ae 100644
--- a/src/boot/fe/item.ml
+++ b/src/boot/fe/item.ml
@@ -1332,6 +1332,6 @@ and parse_mod_items
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/lexer.mll b/src/boot/fe/lexer.mll
index b84e5906bb9e..40e131412a8e 100644
--- a/src/boot/fe/lexer.mll
+++ b/src/boot/fe/lexer.mll
@@ -474,6 +474,6 @@ and comment depth = parse
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/parser.ml b/src/boot/fe/parser.ml
index 3cf464ca7a8c..f961bd39dfbc 100644
--- a/src/boot/fe/parser.ml
+++ b/src/boot/fe/parser.ml
@@ -367,6 +367,6 @@ let bracketed (bra:token) (ket:token) (prule:pstate -> 'a) (ps:pstate) : 'a =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/pexp.ml b/src/boot/fe/pexp.ml
index c4dcfe1ddaa6..062529667b46 100644
--- a/src/boot/fe/pexp.ml
+++ b/src/boot/fe/pexp.ml
@@ -1448,6 +1448,6 @@ and atom_lval (_:pstate) (at:Ast.atom) : Ast.lval =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/fe/token.ml b/src/boot/fe/token.ml
index 7467d4e6eea4..18da8c6d2716 100644
--- a/src/boot/fe/token.ml
+++ b/src/boot/fe/token.ml
@@ -333,6 +333,6 @@ let rec string_of_tok t =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/alias.ml b/src/boot/me/alias.ml
index 77bc769ee53c..1fc4834b855e 100644
--- a/src/boot/me/alias.ml
+++ b/src/boot/me/alias.ml
@@ -151,6 +151,6 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/dead.ml b/src/boot/me/dead.ml
index 376effedad25..d508c664c24f 100644
--- a/src/boot/me/dead.ml
+++ b/src/boot/me/dead.ml
@@ -129,6 +129,6 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/dwarf.ml b/src/boot/me/dwarf.ml
index 5b7c0ca1da15..51bd4184ff09 100644
--- a/src/boot/me/dwarf.ml
+++ b/src/boot/me/dwarf.ml
@@ -3246,7 +3246,7 @@ let rec extract_mod_items
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
 
diff --git a/src/boot/me/effect.ml b/src/boot/me/effect.ml
index fc4d03b17d3e..5a9b81069eb6 100644
--- a/src/boot/me/effect.ml
+++ b/src/boot/me/effect.ml
@@ -310,6 +310,6 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/layer.ml b/src/boot/me/layer.ml
index a5a33b0ba361..e99c9ac83c7f 100644
--- a/src/boot/me/layer.ml
+++ b/src/boot/me/layer.ml
@@ -103,6 +103,6 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/layout.ml b/src/boot/me/layout.ml
index 977066c016be..fd2a90b2b02d 100644
--- a/src/boot/me/layout.ml
+++ b/src/boot/me/layout.ml
@@ -475,6 +475,6 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/loop.ml b/src/boot/me/loop.ml
index 478ae6f9349a..a0fc95702591 100644
--- a/src/boot/me/loop.ml
+++ b/src/boot/me/loop.ml
@@ -159,6 +159,6 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/resolve.ml b/src/boot/me/resolve.ml
index 68353fc9e968..b7fd25ae088e 100644
--- a/src/boot/me/resolve.ml
+++ b/src/boot/me/resolve.ml
@@ -929,7 +929,7 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
 
diff --git a/src/boot/me/simplify.ml b/src/boot/me/simplify.ml
index 97af539ffb70..a4cd1418e381 100644
--- a/src/boot/me/simplify.ml
+++ b/src/boot/me/simplify.ml
@@ -103,7 +103,7 @@ let process_crate (cx:Semant.ctxt) (crate:Ast.crate) : unit =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
 
diff --git a/src/boot/me/trans.ml b/src/boot/me/trans.ml
index 17dbe3ea263b..e99ea8f9c82d 100644
--- a/src/boot/me/trans.ml
+++ b/src/boot/me/trans.ml
@@ -6337,6 +6337,6 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/transutil.ml b/src/boot/me/transutil.ml
index 3c859e0fdaa2..ad012a756cd4 100644
--- a/src/boot/me/transutil.ml
+++ b/src/boot/me/transutil.ml
@@ -246,6 +246,6 @@ let iter_rec_parts
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/type.ml b/src/boot/me/type.ml
index 72bdd4044939..b8ebf242ff9d 100644
--- a/src/boot/me/type.ml
+++ b/src/boot/me/type.ml
@@ -1447,7 +1447,7 @@ let process_crate (cx:Semant.ctxt) (crate:Ast.crate) : unit =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
 
diff --git a/src/boot/me/typestate.ml b/src/boot/me/typestate.ml
index 8b7840a2837d..4c55c12e981b 100644
--- a/src/boot/me/typestate.ml
+++ b/src/boot/me/typestate.ml
@@ -1537,6 +1537,6 @@ let process_crate
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/me/walk.ml b/src/boot/me/walk.ml
index d3fdc9b483b8..d703ee6964e1 100644
--- a/src/boot/me/walk.ml
+++ b/src/boot/me/walk.ml
@@ -724,6 +724,6 @@ and walk_block
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/util/bits.ml b/src/boot/util/bits.ml
index 27bb49021af5..aed0f2b83614 100644
--- a/src/boot/util/bits.ml
+++ b/src/boot/util/bits.ml
@@ -111,6 +111,6 @@ let to_list (v:t) : int list =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/util/common.ml b/src/boot/util/common.ml
index c76da0de552b..638972172934 100644
--- a/src/boot/util/common.ml
+++ b/src/boot/util/common.ml
@@ -818,6 +818,6 @@ let force_sz (a:size) : int64 =
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/boot/util/fmt.ml b/src/boot/util/fmt.ml
index 8fa4169574f2..e62ec1ec7482 100644
--- a/src/boot/util/fmt.ml
+++ b/src/boot/util/fmt.ml
@@ -81,6 +81,6 @@ let sprintf_fmt
  * fill-column: 78;
  * indent-tabs-mode: nil
  * buffer-file-coding-system: utf-8-unix
- * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+ * compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
  * End:
  *)
diff --git a/src/comp/back/abi.rs b/src/comp/back/abi.rs
index cae1dc90e8b8..836969efd7d7 100644
--- a/src/comp/back/abi.rs
+++ b/src/comp/back/abi.rs
@@ -105,6 +105,6 @@ fn no_op_type_glue_name() -> str {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/back/x86.rs b/src/comp/back/x86.rs
index 1ac03d1f4ee1..b961b4743d97 100644
--- a/src/comp/back/x86.rs
+++ b/src/comp/back/x86.rs
@@ -319,6 +319,6 @@ fn get_target_triple() -> str {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 72ace8c3c2b9..69644425758f 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -229,5 +229,5 @@ impure fn main(vec[str] args) {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs
index 6c5fc8854171..797fb7e23956 100644
--- a/src/comp/driver/session.rs
+++ b/src/comp/driver/session.rs
@@ -95,5 +95,5 @@ obj session(ast.crate_num cnum, cfg targ,
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs
index 70b3320d780c..c1e363b76e63 100644
--- a/src/comp/front/ast.rs
+++ b/src/comp/front/ast.rs
@@ -509,6 +509,6 @@ fn is_call_expr(@expr e) -> bool {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/front/creader.rs b/src/comp/front/creader.rs
index ec5e7110fedb..08705715e9ca 100644
--- a/src/comp/front/creader.rs
+++ b/src/comp/front/creader.rs
@@ -297,5 +297,5 @@ fn get_type(session.session sess, ast.def_id def) -> typeck.ty_and_params {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
diff --git a/src/comp/front/eval.rs b/src/comp/front/eval.rs
index 4cf3765f4d37..1cd4dd49ddbe 100644
--- a/src/comp/front/eval.rs
+++ b/src/comp/front/eval.rs
@@ -433,6 +433,6 @@ impure fn eval_crate_directive(parser p,
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/front/extfmt.rs b/src/comp/front/extfmt.rs
index 0a32a851dacd..5028e0c8d38b 100644
--- a/src/comp/front/extfmt.rs
+++ b/src/comp/front/extfmt.rs
@@ -548,6 +548,6 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/front/lexer.rs b/src/comp/front/lexer.rs
index 6975d9c5d6c4..a793a9205bba 100644
--- a/src/comp/front/lexer.rs
+++ b/src/comp/front/lexer.rs
@@ -786,6 +786,6 @@ impure fn next_token(reader rdr) -> token.token {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs
index 6a37128b93c9..dad41e2e75fd 100644
--- a/src/comp/front/parser.rs
+++ b/src/comp/front/parser.rs
@@ -2480,6 +2480,6 @@ impure fn parse_crate_from_crate_file(parser p) -> @ast.crate {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/front/token.rs b/src/comp/front/token.rs
index 72d82010ed72..9d5f0dfd69ab 100644
--- a/src/comp/front/token.rs
+++ b/src/comp/front/token.rs
@@ -359,5 +359,5 @@ fn to_str(token t) -> str {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
diff --git a/src/comp/lib/llvm.rs b/src/comp/lib/llvm.rs
index 1a643fe667ad..73881fd9179e 100644
--- a/src/comp/lib/llvm.rs
+++ b/src/comp/lib/llvm.rs
@@ -1414,6 +1414,6 @@ fn mk_section_iter(ObjectFileRef llof) -> section_iter {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs
index da898f4d01e9..27fad370c9f5 100644
--- a/src/comp/middle/fold.rs
+++ b/src/comp/middle/fold.rs
@@ -1639,6 +1639,6 @@ fn new_identity_fold[ENV]() -> ast_fold[ENV] {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs
index 2c378c8f3af8..820687caea9a 100644
--- a/src/comp/middle/resolve.rs
+++ b/src/comp/middle/resolve.rs
@@ -685,5 +685,5 @@ fn resolve_crate(session.session sess, @ast.crate crate) -> @ast.crate {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index 0acbb7e1461f..f5fcf5876121 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -6550,6 +6550,6 @@ fn trans_crate(session.session sess, @ast.crate crate, str output,
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs
index fba9a1fd78ab..e22ebceab35a 100644
--- a/src/comp/middle/ty.rs
+++ b/src/comp/middle/ty.rs
@@ -1675,5 +1675,5 @@ fn substitute_ty_params(vec[ast.ty_param] ty_params, vec[@t] bound, @t ty)
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index 51f8253a08cb..596d9d4bd4de 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/comp/middle/typeck.rs
@@ -2612,6 +2612,6 @@ fn check_crate(session.session sess, @ast.crate crate) -> @ast.crate {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/comp/util/common.rs b/src/comp/util/common.rs
index b23d6a1ef147..c7d9427947d7 100644
--- a/src/comp/util/common.rs
+++ b/src/comp/util/common.rs
@@ -83,6 +83,6 @@ fn istr(int i) -> str {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
diff --git a/src/rt/util/synchronized_indexed_list.h b/src/rt/util/synchronized_indexed_list.h
index 52fabe059608..c4894351a57d 100644
--- a/src/rt/util/synchronized_indexed_list.h
+++ b/src/rt/util/synchronized_indexed_list.h
@@ -68,7 +68,7 @@ public:
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //