From 5b50003f33bcbe0c13d2027630f718f661bf6eb9 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sun, 22 Jul 2012 17:34:05 +0700 Subject: [PATCH] Ignore fail of git-describe differently. Now it doesn't show an error message and still continues. Thanks to Han` for reporting this. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index b6616a6b..2d9d4915 100644 --- a/Makefile.in +++ b/Makefile.in @@ -107,7 +107,7 @@ src/version.o: src/version.cpp Makefile $(shell if [ x`cat .version_extra 2> /de @mkdir -p .depend src $(E) Building core object version... $(Q)$(CXX) $(shell $(GIT) --git-dir=$(srcdir)/.git describe 2> /dev/null | $(SED) 's/.*-\([0123456789][0123456789]*\)-g\(.*\)/-DVERSION_EXTRA="\\"-git-\1-\2\\""/') $(CXXFLAGS) -c -o $@ $< -MD -MF .depend/version.dep -MT $@ - -$(Q)$(GIT) --git-dir=$(srcdir)/.git describe > .version_extra 2> /dev/null + $(Q)$(GIT) --git-dir=$(srcdir)/.git describe > .version_extra 2> /dev/null || true endif install: znc $(LIBZNC)