Fix generation of commit_id.h when source is compiled directly from git

vbwagner · vbwagner · commit d4b1835247af · 2017-04-14T16:10:37.000+03:00
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
@@ -836,7 +836,8 @@ endif # enable_nls
 
 .PHONY: $(top_builddir)/src/include/commit_id.h
 $(top_builddir)/src/include/commit_id.h:
-	[ -d .git ] && git log -1 --format='#define COMMIT_ID "%h"' > $@.tmp && mv $@.tmp $@
+	-[ -e $(top_srcdir)/src/include/commit_id.h ] && cp $(top_srcdir)/src/include/commit_id.h $@
+	-[ -d $(top_srcdir)/.git ] && git log -1 --format='#define COMMIT_ID "%h"' > $@.tmp && mv $@.tmp $@
 	[ -e $@ ] ||  echo '#define COMMIT_ID "00000000"' >$@ 
 
 ##########################################################################
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
@@ -35,4 +35,6 @@ like.o: like.c like_match.c
 
 varlena.o: varlena.c levenshtein.c
 
+version.o: version.c $(top_builddir)/src/include/commit_id.h
+
 include $(top_srcdir)/src/backend/common.mk
