Merge branch 'maint'

* maint:
  make git version macro work if compiled outside of src dir

diff --cc configure.ac
Simple merge

diff --cc dev.mk.in
Simple merge