Auto merge of #3398 - alexcrichton:git-rev, r=alexcrichton

Fix git rev showing up in version number

Makefiles didn't support an out-of-tree build, so needed to update them to do
so.

Author: bors

Makefile.in

@@ -24,11 +24,11 @@ endif
 
 CFG_BUILD_DATE = $(shell date +%F)
 
-ifeq ($(wildcard .git),)
+ifeq ($(wildcard $(CFG_SRC_DIR)/.git),)
 CFG_VERSION = $(CFG_RELEASE) (built $(CFG_BUILD_DATE))
 else
-CFG_VER_DATE = $(shell git log -1 --date=short --pretty=format:'%cd')
-CFG_VER_HASH = $(shell git rev-parse --short HEAD)
+CFG_VER_DATE = $(shell git --git-dir='$(CFG_SRC_DIR).git' log -1 --date=short --pretty=format:'%cd')
+CFG_VER_HASH = $(shell git --git-dir='$(CFG_SRC_DIR).git' rev-parse --short HEAD)
 CFG_VERSION = $(CFG_RELEASE) ($(CFG_VER_HASH) $(CFG_VER_DATE))
 endif
 PKG_NAME = cargo-$(CFG_PACKAGE_VERS)