From 43a447b660e1e061bfa1b5a50b91f6d13db66ec0 Mon Sep 17 00:00:00 2001 From: Mark Grondona <mgrondona@llnl.gov> Date: Thu, 6 Mar 2003 22:14:47 +0000 Subject: [PATCH] o fix broken AC_SLURM_VERSION macro --- acinclude.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 4c0eeac0559..fa9d3c1fc60 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -117,13 +117,13 @@ MINOR="`perl -ne 'print,exit if s/^\s*MINOR:\s*(\S*).*/\1/i' $srcdir/META`" MICRO="`perl -ne 'print,exit if s/^\s*MICRO:\s*(\S*).*/\1/i' $srcdir/META`" RELEASE="`perl -ne 'print,exit if s/^\s*RELEASE:\s*(\S*).*/\1/i' $srcdir/META`" SLURM_RELEASE="`echo $RELEASE | sed 's/^.*\.//'`" -SLURM_VERSION="$SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO-$SLURM_RELEASE" -test $SLURM_RELEASE != "1" || SLURM_VERSION="$SLURM_VERSION-$SLURM_RELEASE" -AC_DEFINE_UNQUOTED(SLURM_MAJOR, "$SLURM_MAJOR", +SLURM_VERSION="$MAJOR.$MINOR.$MICRO" +test $RELEASE = "1" || SLURM_VERSION="$SLURM_VERSION-$SLURM_RELEASE" +AC_DEFINE_UNQUOTED(SLURM_MAJOR, "$MAJOR", [Define the project's major version.]) -AC_DEFINE_UNQUOTED(SLURM_MINOR, "$SLURM_MINOR", +AC_DEFINE_UNQUOTED(SLURM_MINOR, "$MINOR", [Define the project's minor version.]) -AC_DEFINE_UNQUOTED(SLURM_MICRO, "$SLURM_MICRO", +AC_DEFINE_UNQUOTED(SLURM_MICRO, "$MICRO", [Define the project's minor version.]) AC_DEFINE_UNQUOTED(RELEASE, "$RELEASE", [Define the project's release.]) AC_DEFINE_UNQUOTED(SLURM_VERSION, "$SLURM_VERSION", -- GitLab