Merge branch 'master' into development
This commit is contained in:
commit
190f020595
3 changed files with 3 additions and 2 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -21,3 +21,4 @@ src/converters/Mist*
|
|||
/missing
|
||||
/depcomp
|
||||
.libs
|
||||
VERSION
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
SUBDIRS=lib src
|
||||
EXTRA_DIST=server.html
|
||||
EXTRA_DIST=server.html VERSION
|
||||
docs:
|
||||
doxygen ./Doxyfile > /dev/null
|
||||
.PHONY: docs
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([MistServer],
|
||||
m4_esyscmd([git describe --tags | tr -d '\n']),
|
||||
m4_esyscmd([git rev-parse 2>/dev/null&&git describe --tags > VERSION;tr -d '\n' < VERSION]),
|
||||
[contact@ddvtech.com])
|
||||
AC_CONFIG_SRCDIR([src/buffer.cpp])
|
||||
# foreign: no need for NEWS or INSTALL files
|
||||
|
|
Loading…
Add table
Reference in a new issue