From c254957078207047a224d6e16c46ff53299bfd78 Mon Sep 17 00:00:00 2001 From: Vitali Haravy Date: Mon, 10 Nov 2014 21:05:34 +0000 Subject: [PATCH 1/2] Attempt to fix the problem with failing distcheck. --- mk/dist.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/dist.mk b/mk/dist.mk index 30599b0217d7..718b5bf6df60 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -125,7 +125,7 @@ $(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \ dist-prepare-win $(CFG_PYTHON) $(S)src/etc/make-win-dist.py tmp/dist/win $(CFG_BUILD) @$(call E, ISCC: $@) - $(Q)"$(CFG_ISCC)" $< + $(Q)$(CFG_ISCC) $< $(eval $(call DEF_PREPARE,win)) From 7c36336c6f94d49bdfdf5cbf0c09e353c79534a4 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 10 Nov 2014 09:54:25 -0800 Subject: [PATCH 2/2] mk: Fix configuration of version commit information Commit bec2ee77f78b4bb8a503101091272a634a273a1c started quoting paths discovered as part of the `probe` function, which includes git. The `make` `wildcard` function appears to be incompatible with quoted paths so this check in the makefile now fails. Employing `wildcard` here appears to only re-verify that git actually exists, which the configure script already did, so I've just removed it. Additionally, with the quoted paths the `subst` function should no longer be needed, so I've removed it as well. Closes #18771 --- mk/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/main.mk b/mk/main.mk index aba02088eabe..3df4d3bfa5ec 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -52,7 +52,7 @@ CFG_GIT_DIR := $(CFG_SRC_DIR).git # so we use a hack: define $(SPACE) which contains space character. SPACE := SPACE += -ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),) +ifneq ($(CFG_GIT),) ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),) CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci') CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)