Auto merge of rust-lang#38252 - pnkfelix:mildly-robustify-configure-m…

…sg, r=alexcrichton

Make configure message re x.py not assume build dir == src dir

Fix rust-lang#38251 but perhaps not BEST fix for it.

As driveby, fix copyright year in `Makefile.in`

configure

@@ -1890,14 +1890,20 @@ else
     step_msg "complete"
 fi
 
+if [ "$CFG_SRC_DIR" = `pwd` ]; then
+    X_PY=x.py
+else
+    X_PY=${CFG_SRC_DIR_RELATIVE}x.py
+fi
+
 if [ -z "$CFG_DISABLE_RUSTBUILD" ]; then
     msg "NOTE you have now configured rust to use a rewritten build system"
     msg "     called rustbuild, and as a result this may have bugs that "
     msg "     you did not see before. If you experience any issues you can"
     msg "     go back to the old build system with --disable-rustbuild and"
     msg "     please feel free to report any bugs!"
     msg ""
-    msg "run \`python x.py --help\`"
+    msg "run \`python ${X_PY} --help\`"
 else
     warn "the makefile-based build system is deprecated in favor of rustbuild"
     msg ""

src/bootstrap/mk/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright 20126 The Rust Project Developers. See the COPYRIGHT
+# Copyright 2016 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
 #