From 6bf0dcff3d079c73c857044d2f9c09e9a117bd7e Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 2 Jan 2016 11:33:01 +0100 Subject: [PATCH] better SCAN_VERSION building --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index af150511..7cc30448 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,7 @@ AC_CONFIG_FILES([Makefile AC_DEFINE_UNQUOTED(PACKAGE_PIDFILE, LOCALSTATEDIR "/run/" PACKAGE ".pid", [The path and name of the PID file.]) AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, LOCALSTATEDIR "/log/" PACKAGE ".log", [The path and name of the log file.]) AC_DEFINE_UNQUOTED(PACKAGE_CONFIGPATH, SYSCONFDIR "/" PACKAGE, [The default path of the configuration files.]) -AC_DEFINE(SCAN_VERSION, "[m4_esyscmd_s([sed -e 's#^\([1-9]\)\.#0\1.#' -e 's#\.\([0-9]\)[^0-9]*$#.0\1#' -e 's#\.##' VERSION])]", [The version of the package formatted for the scan result.]) +AC_DEFINE(SCAN_VERSION, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\.[0-9]*\).*#\1#' -e 's#\.\([0-9]\)$#0\1#' -e 's#\.##' VERSION])]", [The version of the package formatted for the scan result.]) AC_DEFINE(REVISION, "[m4_esyscmd_s([git describe --always 2>/dev/null || (echo -n 'p'; date +%Y%m%d)])]", [The revision of the package.]) AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], [])