Commit 5b9eb472 authored by Niels Möller's avatar Niels Möller
Browse files

Tweak sed expressions for substitutions in version.h.

parent f51bd649
2015-03-25 Niels Möller <nisse@diamant.hack.org> 2015-03-25 Niels Möller <nisse@diamant.hack.org>
* configure.ac (MAJOR_VERSION, MINOR_VERSION): Tweak sed
expressions, to tolerate version suffixes.
* Makefile.in (distdir): Include assembly files from the new * Makefile.in (distdir): Include assembly files from the new
x86_64/aesni, x86_64/fat, and arm/fat directories. x86_64/aesni, x86_64/fat, and arm/fat directories.
......
...@@ -16,8 +16,9 @@ LIBNETTLE_MINOR=0 ...@@ -16,8 +16,9 @@ LIBNETTLE_MINOR=0
LIBHOGWEED_MAJOR=4 LIBHOGWEED_MAJOR=4
LIBHOGWEED_MINOR=0 LIBHOGWEED_MINOR=0
MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/\(.*\)\..*/\1/g'` dnl Note double square brackets, for extra m4 quoting.
MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)/\1/g'` MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^\([[^.]]*\)\..*/\1/'`
MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^[[^.]]*\.\([[0-9]]*\).*/\1/'`
AC_SUBST([MAJOR_VERSION]) AC_SUBST([MAJOR_VERSION])
AC_SUBST([MINOR_VERSION]) AC_SUBST([MINOR_VERSION])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment