diff --git a/ChangeLog b/ChangeLog index 3094789506b89702c108473238149e12545aacda..33ee0184385368be7bf3523f6bdc2535c710d58d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 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 x86_64/aesni, x86_64/fat, and arm/fat directories. diff --git a/configure.ac b/configure.ac index 56f69097a058ad48a527c5814a52bda33ce4bafd..2b4c03c5b45fe28ca9d7175f97e7b6c31456743a 100644 --- a/configure.ac +++ b/configure.ac @@ -16,8 +16,9 @@ LIBNETTLE_MINOR=0 LIBHOGWEED_MAJOR=4 LIBHOGWEED_MINOR=0 -MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/\(.*\)\..*/\1/g'` -MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)/\1/g'` +dnl Note double square brackets, for extra m4 quoting. +MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^\([[^.]]*\)\..*/\1/'` +MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^[[^.]]*\.\([[0-9]]*\).*/\1/'` AC_SUBST([MAJOR_VERSION]) AC_SUBST([MINOR_VERSION])