From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Nov 2017 05:57:52 +0000 (+0900)
Subject: Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-build
X-Git-Tag: v2.16.0-rc0~78^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/da10ea373b80cc8bf8efca5acb1d11ecf410fb0c?hp=7513595a3b997e07ad525b213b83e4f0bd358bb9

Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-build

* 'jn/reproducible-build' of ../git-gui:
git-gui: sort entries in optimized tclIndex
---

diff --git a/git-gui/Makefile b/git-gui/Makefile
index 918a8de369..f10caedaa7 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -254,7 +254,7 @@ $(ALL_MSGFILES): %.msg : %.po
 lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
 	$(QUIET_INDEX)if echo \
 	  $(foreach p,$(PRELOAD_FILES),source $p\;) \
-	  auto_mkindex lib '*.tcl' \
+	  auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \
 	| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
 	else \
 	 echo >&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \