Makefile: Fix git detection when building in a subdir (#299)

orgads · web-flow · commit 1e44181b97d0 · 2023-06-29T13:24:32.000+01:00
This should work if you build in $srcdir/build, but it will fail if you
build *outside* the source directory (e.g. $srcdir/../drachtio-build).
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-MYVERSION=$(shell [ -e .git ] && git describe --always || echo 1.0.0)
+MYVERSION=$(shell git describe --always 2>/dev/null || echo 1.0.0)
 INCLUDES= -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/su -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/nta \
  -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/sip -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/msg \
  -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/url -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/tport \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-MYVERSION=$(shell [ -e .git ] && git describe --always \|\| echo 1.0.0)`
	`1`	`+MYVERSION=$(shell git describe --always 2>/dev/null \|\| echo 1.0.0)`
`2`	`2`	`INCLUDES= -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/su -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/nta \`
`3`	`3`	`-I${srcdir}/deps/sofia-sip/libsofia-sip-ua/sip -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/msg \`
`4`	`4`	`-I${srcdir}/deps/sofia-sip/libsofia-sip-ua/url -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/tport \`