diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c961005c9..853d91ecb 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT(ejabberd, community, [ejabberd@process-one.net], [ejabberd]) +AC_INIT(ejabberd, community m4_esyscmd([git describe --tags | tr -d '\n']), [ejabberd@process-one.net], [ejabberd]) REQUIRE_ERLANG_MIN="5.9.1 (Erlang/OTP R15B01)" REQUIRE_ERLANG_MAX="9.0.0 (No Max)" @@ -35,7 +35,7 @@ AC_ERLANG_NEED_ERLC AC_ARG_ENABLE(erlang-version-check, [AC_HELP_STRING([--enable-erlang-version-check], [Check Erlang/OTP version @<:@default=yes@:>@])]) - case "$enable_erlang_version_check" in +case "$enable_erlang_version_check" in yes|'') ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX]) ;; diff --git a/doc/Makefile b/doc/Makefile index 55d34ae5d..db378be67 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -13,12 +13,12 @@ all: release pdf html release: @echo "Notes for the releaser:" @echo "* Do not forget to add a link to the release notes in guide.tex" - @echo "* Do not forget to update the version number in src/ejabberd.app!" + @echo "* Do not forget to update the version number in ebin/ejabberd.app!" @echo "* Do not forget to update the features in introduction.tex (including \new{} and \improved{} tags)." @echo "Press any key to continue" ##@read foo @echo "% ejabberd version (automatically generated)." > version.tex - @echo "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../src/ejabberd.app`"}" >> version.tex + @echo "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../ebin/ejabberd.app`"}" >> version.tex @echo -n "% Contributed modules (automatically generated)." > contributed_modules.tex @echo -e "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex |