diff --git a/Makefile.in b/Makefile.in
index ccbac6518d22b9ddcdf95aa06a8a773aa58497f0..64f1a4d6eef69b7bf0727dca962c83b4e5978b58 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -281,7 +281,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/NEWS b/NEWS
index b5de58e96def8dde55b2cd581b943265ed4b9442..190a205f24722f9ea8819864f21eec5c2e25c9dd 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 2.2.0.pre0
=============================
-- Added RunTime field to scontrol show job report
+ -- Added SLURM_VERSION_NUMBER and removed SLURM_API_VERSION from slurm/slurm.h.
* Changes in SLURM 2.1.1
=============================
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 1dad4f1f33602ba261c1c92470bdb3b6dd7d398c..0b9417bfdd14c16f91b0765cfb0bec7b070c1065 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -197,7 +197,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/auxdir/slurm.m4 b/auxdir/slurm.m4
index c4abb36f1c807a08f242adad69f332ce9d807e04..fedfcf7a1a390e1b8161308073ee564bbcf818d9 100644
--- a/auxdir/slurm.m4
+++ b/auxdir/slurm.m4
@@ -151,9 +151,9 @@ SLURM_MINOR="`perl -ne 'print,exit if s/^\s*MINOR:\s*(\S*).*/\1/i' $srcdir/META`
SLURM_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_VERSION="`printf "0x%02x%02x%02x" $SLURM_MAJOR $SLURM_MINOR $SLURM_MICRO`"
-AC_DEFINE_UNQUOTED(SLURM_VERSION, $SLURM_VERSION, [SLURM Version Number])
-AC_SUBST(SLURM_VERSION)
+SLURM_VERSION_NUMBER="`printf "0x%02x%02x%02x" $SLURM_MAJOR $SLURM_MINOR $SLURM_MICRO`"
+AC_DEFINE_UNQUOTED(SLURM_VERSION_NUMBER, $SLURM_VERSION_NUMBER, [SLURM Version Number])
+AC_SUBST(SLURM_VERSION_NUMBER)
if test "$SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO" != "$VERSION"; then
AC_MSG_ERROR([META information is inconsistent: $VERSION != $SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO!])
diff --git a/config.h.in b/config.h.in
index 4326cdbcf96eeb9637a04b2b295ed25fa2f723a8..f069913ebef8c4e1caad493bd4059d05ca7f284e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -425,9 +425,6 @@
/* Define Slurm installation prefix */
#undef SLURM_PREFIX
-/* SLURM Version Number */
-#undef SLURM_VERSION
-
/* Define the project's version string. */
#undef SLURM_VERSION_STRING
diff --git a/configure b/configure
index dc40b02ccb3bb330c9ec6f233e6eb4f13fea0c26..3bedd7166728758315376d78e64eefb3769481b4 100755
--- a/configure
+++ b/configure
@@ -907,7 +907,7 @@ RELEASE
SLURM_MICRO
SLURM_MINOR
SLURM_MAJOR
-SLURM_VERSION
+SLURM_VERSION_NUMBER
VERSION
SLURM_API_REVISION
SLURM_API_AGE
@@ -2866,10 +2866,10 @@ SLURM_MINOR="`perl -ne 'print,exit if s/^\s*MINOR:\s*(\S*).*/\1/i' $srcdir/META`
SLURM_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_VERSION="`printf "0x%02x%02x%02x" $SLURM_MAJOR $SLURM_MINOR $SLURM_MICRO`"
+SLURM_VERSION_NUMBER="`printf "0x%02x%02x%02x" $SLURM_MAJOR $SLURM_MINOR $SLURM_MICRO`"
cat >>confdefs.h <<_ACEOF
-#define SLURM_VERSION $SLURM_VERSION
+#define SLURM_VERSION_NUMBER $SLURM_VERSION_NUMBER
_ACEOF
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index f2deb0c2ede2f0d5d9be32e7c108fb75958e3f8b..2da32fa7a291855d59b09b6ea106af83a51404b9 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -236,7 +236,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/contribs/pam/Makefile.in b/contribs/pam/Makefile.in
index 20cb35cdfb7afa6e731091827a62be200916d021..f7bbd896e3aad96a0fc908e5bd2c40fe3a13f8b4 100644
--- a/contribs/pam/Makefile.in
+++ b/contribs/pam/Makefile.in
@@ -251,7 +251,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/contribs/perlapi/Makefile.in b/contribs/perlapi/Makefile.in
index 79f371efdd834ce6d927e9858385aa19a116ff16..5c5c5984cc68c93e8e1045a7ca9de5c5df1658a0 100644
--- a/contribs/perlapi/Makefile.in
+++ b/contribs/perlapi/Makefile.in
@@ -196,7 +196,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/contribs/phpext/Makefile.in b/contribs/phpext/Makefile.in
index 2e6f4145d9f777db575e74945214108ca38d1b79..cdefa217d3eefc10566fb88f60b9323e9981c150 100644
--- a/contribs/phpext/Makefile.in
+++ b/contribs/phpext/Makefile.in
@@ -196,7 +196,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/contribs/slurmdb-direct/Makefile.in b/contribs/slurmdb-direct/Makefile.in
index d621cf68ab096bd71580ac0306a205830a202c50..0a0bc3d7690817ade4be4fa5a7797160d5a692e6 100644
--- a/contribs/slurmdb-direct/Makefile.in
+++ b/contribs/slurmdb-direct/Makefile.in
@@ -223,7 +223,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/contribs/torque/Makefile.in b/contribs/torque/Makefile.in
index 903c7a9c9fb326dfc9399a055d319903febc7762..bbb1758bdc1ea8b289c372ae29cecc9a1d7ab420 100644
--- a/contribs/torque/Makefile.in
+++ b/contribs/torque/Makefile.in
@@ -223,7 +223,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2ebd81f388fc87ea5e275f683264a09f71ad16dc..423e9974064464c08a75b437a252b3ccb7313e94 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -236,7 +236,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index dd682cf6e5f1daa1b9caa953c216b2f75f615295..775d4302ea266e1c911420e82fc0fc8f51f5bfd0 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -221,7 +221,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index c900787672d143358e29e51b7f7e561511aca895..73369ee0dfef2a15404df6a0195edb529f28adc9 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -225,7 +225,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index 5cc894ce7bf9c39e161bd9a6bee0709e6e0befed..85a514bc8ca126bc6cf93a14ed6f3f3e6f278333 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -179,21 +179,19 @@ BEGIN_C_DECLS
/*****************************************************************************\
* DEFINITIONS FOR VERSION MANAGEMENT
\*****************************************************************************/
-
+/* Define SLURM version number.
+ * High-order byte is major version.
+ * Middle byte is minor version.
+ * Low-order byte is micro version.
+ * Use SLURM_VERSION_NUM macro to compare versions, for example
+ * #if SLURM_VERSION_NUMBER > SLURM_VERSION_NUM(2,1,0)
+ */
+#undef SLURM_VERSION_NUMBER
#define SLURM_VERSION_NUM(a,b,c) (((a) << 16) + ((b) << 8) + (c))
#define SLURM_VERSION_MAJOR(a) (((a) >> 16) & 0xff)
#define SLURM_VERSION_MINOR(a) (((a) >> 8) & 0xff)
#define SLURM_VERSION_MICRO(a) ((a) & 0xff)
-/* Define the API's version. Update in META as needed.
- * Also defined in config.h.
- * High-order byte is major version. Update when existing APIs change.
- * Middle byte is minor version. Update when new functions are added.
- * Low-order byte is micro version. Update on patches and bug fixes. */
-#ifndef SLURM_API_VERSION
-#undef SLURM_API_VERSION
-#endif
-
/*****************************************************************************\
* DEFINITIONS FOR INPUT VALUES
\*****************************************************************************/
diff --git a/src/Makefile.in b/src/Makefile.in
index d7afaa0749f3e5d8dd74d04d86c855dd20106eee..6be0a6a7c5f9f7c5f22d49784849a071ec54631f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -239,7 +239,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index be6c4939a8f0b9e450a657bafc5250274a9a38d1..397ae3789509964302f5bd3e1ca87a116c578f74 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -272,7 +272,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 739604861d95284aa0825a44fe3e20807c0d72c8..1c86ea24634c1b4e81b684fc08c2cb61da3ebf67 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -311,7 +311,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/database/Makefile.in b/src/database/Makefile.in
index 6205d67205aa7fcea89f86991e0ed79a20b6dfd6..b3cb86afb4215f276d61db8a4c8a2176e91a0e62 100644
--- a/src/database/Makefile.in
+++ b/src/database/Makefile.in
@@ -248,7 +248,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index dddf98d634061092d257cf7e84df177e0b7c89a6..f136925560c322c98a780ab8bdbd3686048c4e3e 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -236,7 +236,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/accounting_storage/Makefile.in b/src/plugins/accounting_storage/Makefile.in
index f597a7f96c4a72e99f98fe9a80c417c5416e1805..0644a4ca2d172a312eed6d144cbd115c3d6fe404 100644
--- a/src/plugins/accounting_storage/Makefile.in
+++ b/src/plugins/accounting_storage/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in
index 960a8b27059699778eca4ee36ee9453f734f3454..c41d1c21a243e95bc5707219941d65f8c5d89c58 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.in
+++ b/src/plugins/accounting_storage/filetxt/Makefile.in
@@ -246,7 +246,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/accounting_storage/mysql/Makefile.in b/src/plugins/accounting_storage/mysql/Makefile.in
index b5c2e6cd4438bcd505c7c51ca34d60342cbe3b30..bfc57aba51238ce85fbaeb2b420985c1e6df5220 100644
--- a/src/plugins/accounting_storage/mysql/Makefile.in
+++ b/src/plugins/accounting_storage/mysql/Makefile.in
@@ -262,7 +262,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/accounting_storage/none/Makefile.in b/src/plugins/accounting_storage/none/Makefile.in
index 4850a4f666d41fd06ee9f4df784b57b0816f0d90..3bca8973602138959c52231c84cf20e28f0e7717 100644
--- a/src/plugins/accounting_storage/none/Makefile.in
+++ b/src/plugins/accounting_storage/none/Makefile.in
@@ -245,7 +245,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/accounting_storage/pgsql/Makefile.in b/src/plugins/accounting_storage/pgsql/Makefile.in
index 085f93f9164e5ff6df73db66caeccc6ad44cd0be..bb8ebfd62234b17c393202e525c15cc2b6116c00 100644
--- a/src/plugins/accounting_storage/pgsql/Makefile.in
+++ b/src/plugins/accounting_storage/pgsql/Makefile.in
@@ -258,7 +258,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in
index e22df39eba9a8145a6428883c4bbb22fca645944..5e8448957d2b3391fd4bf4232453ecc0cc247259 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.in
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in
@@ -246,7 +246,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index 58409fa92c1df5077c00ef5429fef53ebf1ad7e3..bbc1ca2b4b32f377661c30e7dd3c82ec4866dc1f 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index efa5e5e73dd0d63d698b5fa4e32b7aa4af4a4451..d892e1e594ec8200be4c724c50f851bb4e15f773 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -244,7 +244,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index b0a9dd99a2bb28d1b4cbeb3945574062e9da075a..cf569286dad07d384ee330c0d560c030a39defb0 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -245,7 +245,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index d7395d272390b8f1414043ac01229059bd927997..b2448e333cd059eee9c46505caf38c520c30a306 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 1c9193fbd5a85e2ba70e231f6ec36aa8d60a3092..356645dc1ed06bf9a0c1ffaa93fef133f3d0543d 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index 65dc405afd397011cc7b948e8d92646494a2bdb8..17013e4e8f1ee8207556297bc0f1c3c0ff2cbf95 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -248,7 +248,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/checkpoint/blcr/Makefile.in b/src/plugins/checkpoint/blcr/Makefile.in
index 74cf2399366a1fc321a990a9bba3e630fbe092a6..33dfccbfb1941418f845242594fcfbed7c738afa 100644
--- a/src/plugins/checkpoint/blcr/Makefile.in
+++ b/src/plugins/checkpoint/blcr/Makefile.in
@@ -254,7 +254,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index d448a35a2851dcaaa03d126f919544167829feef..ecee6b1583144ede4c99b2a1463ce737e98c4c46 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in
index dda07eb81553133b78b9a99644d5b5441c733e75..8d789f3138f757144fdba9dd500f70ff03e33601 100644
--- a/src/plugins/checkpoint/ompi/Makefile.in
+++ b/src/plugins/checkpoint/ompi/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/checkpoint/xlch/Makefile.in b/src/plugins/checkpoint/xlch/Makefile.in
index ea71407e571655f9100837d1207882592de33019..b3b6a3f4420c7eeecc57358bab96d85cb0f75ed6 100644
--- a/src/plugins/checkpoint/xlch/Makefile.in
+++ b/src/plugins/checkpoint/xlch/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/crypto/Makefile.in b/src/plugins/crypto/Makefile.in
index ec32a24a5c37c846dca9c81e075ea87172768e2e..3a2785427378d80308e6d2245da8d30deb74601c 100644
--- a/src/plugins/crypto/Makefile.in
+++ b/src/plugins/crypto/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/crypto/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in
index 3e75d8464a7e8d603ddda9f48e4f34ac4ca048e5..fd45bd4c20c17f309ef8a0ced9ce917ede6ef65d 100644
--- a/src/plugins/crypto/munge/Makefile.in
+++ b/src/plugins/crypto/munge/Makefile.in
@@ -245,7 +245,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index c6cca5ba637226cbf975501ea9f4beea24096265..3dbf9202dd3ea498e1ff9e48c3cf42c2b9610302 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -250,7 +250,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobacct_gather/Makefile.in b/src/plugins/jobacct_gather/Makefile.in
index 3311f7fd15751974905559f26b3c9f2b65d4af31..f3c167ff5e27858edd885ffb5d4243facd461805 100644
--- a/src/plugins/jobacct_gather/Makefile.in
+++ b/src/plugins/jobacct_gather/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in
index 41c5231b25c128b86178b8d57dc97b5bd637900b..dc63e0c68804cc76b6aca6ae6d6181463eb816d3 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.in
+++ b/src/plugins/jobacct_gather/aix/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index 2b3c1ba19d0792518cbbf1d2ece183c32218d2c4..4e22364aa719f46be14b7f0e1c748d8e87f53da3 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -245,7 +245,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in
index 040c3e6e58c375a9707770c60ef3d8f8f2051cc5..0e22b30d382a20d5d2caa054e0d54ef8ecf2a768 100644
--- a/src/plugins/jobacct_gather/none/Makefile.in
+++ b/src/plugins/jobacct_gather/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index 823d2c6a54f155d4ecccfdcf8e33ecec24e2d772..0b3b4d9658ccf4c3c95d6f282f7a10d9db09efba 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 1803ca1664b83002d5cca148fad8cbc7b5ecd0c0..45ff01c716f6f2b337c71af1b85f4ca033794894 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -244,7 +244,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in
index ab15a307798ea1a0adb87fc2bd1b6942128fad01..76d4e9afd50226bc1538fa0185f419a6409d01d1 100644
--- a/src/plugins/jobcomp/mysql/Makefile.in
+++ b/src/plugins/jobcomp/mysql/Makefile.in
@@ -252,7 +252,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index bfd204a38f039635204fe5ecfb0902f83df6528d..2f9d8a9fe63883c18750f4a14d901631613f2fd8 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobcomp/pgsql/Makefile.in b/src/plugins/jobcomp/pgsql/Makefile.in
index e59d3efe8b72d98b882e70d4aa6a8023df106b66..992e92ae5559628e9e2897e8b7250c937ed85f7e 100644
--- a/src/plugins/jobcomp/pgsql/Makefile.in
+++ b/src/plugins/jobcomp/pgsql/Makefile.in
@@ -252,7 +252,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 37583fee7f1e6ae5d7415f1d245c542ef2805d73..154a7d5aa6f5a8732bda8a6158bc297d383efe0a 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index e38a2c1a8d538a83f4df37315e38ae6be351ccae..b6d740e28943391aebd9220ebe431107c672fdf5 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index 1513e31313871ffb72bbc8a31f8cb45240c0030e..4426535670013641391b8ead7ead23726332800b 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index f455296919f9a254d666cdb4d136ea0cdf5186f7..06e9f86533ec59a76f84ee13b09bf0f973532fbe 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index 775393e474c6f62a41b237c9cb2b052ab0936904..825b1703c2d86d4e8edad54e33ec19e2a8fa804c 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index fa4e2006135c5df121e516edc16858edf6a903fd..5760bcb46363124fa175820523922dd78d75c3ed 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in
index b84449e4c3b8db48af971a00b3088e2d1c8b782b..f30eff69784a2a5fc758055a43802ea400af27af 100644
--- a/src/plugins/mpi/mpichmx/Makefile.in
+++ b/src/plugins/mpi/mpichmx/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index 4ef564f70912fdb705745d3817db88e14381a3e8..6e03fdf86d48adcc043e6e993de532b9a024939c 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 5113f8af0a0cbdd0199347cd735a99db5d129470..e3faafde12fc0240124918e432d0d8bfeba9f358 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index 4f4ee066af57c00c9b36e86c26add58b4af54e6b..5916a3850a54e1e90769473bf92fb8c6c1073f3f 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/preempt/Makefile.in b/src/plugins/preempt/Makefile.in
index 32513370a71d3e42d199741a09076cf10a6b535d..18672790c76cc051d6f26ea5e89fb5b87673fcee 100644
--- a/src/plugins/preempt/Makefile.in
+++ b/src/plugins/preempt/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/preempt/none/Makefile.in b/src/plugins/preempt/none/Makefile.in
index 8e74bfc6718ab46c4d4f4fe8894b2d72ba92626d..8894359585995ff32d983f14728b84f7c5e67c25 100644
--- a/src/plugins/preempt/none/Makefile.in
+++ b/src/plugins/preempt/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/preempt/partition_prio/Makefile.in b/src/plugins/preempt/partition_prio/Makefile.in
index 6e6bc2f8861bd11c474ea282cb78a909876c893e..f40c0a076fff8b246235ed5eeb96fe675c13c38e 100644
--- a/src/plugins/preempt/partition_prio/Makefile.in
+++ b/src/plugins/preempt/partition_prio/Makefile.in
@@ -245,7 +245,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/preempt/qos/Makefile.in b/src/plugins/preempt/qos/Makefile.in
index c99af8251b3ddf326cc0531e1b9aaa76b6742926..aafaccc4aa120816baaab18b9762e77b6d24b9a1 100644
--- a/src/plugins/preempt/qos/Makefile.in
+++ b/src/plugins/preempt/qos/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/priority/Makefile.in b/src/plugins/priority/Makefile.in
index 2b83e1012c8e0f2c53e4410c3086e4825b7b3f2d..aa275170b8eda655af51e1e1fece8c9a720c4283 100644
--- a/src/plugins/priority/Makefile.in
+++ b/src/plugins/priority/Makefile.in
@@ -236,7 +236,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/priority/basic/Makefile.in b/src/plugins/priority/basic/Makefile.in
index fcebedcd10bfc0676a9378472c7db71e4014e80b..96d92b982a04956255580ebdaadf2d4266abcda3 100644
--- a/src/plugins/priority/basic/Makefile.in
+++ b/src/plugins/priority/basic/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/priority/multifactor/Makefile.in b/src/plugins/priority/multifactor/Makefile.in
index a7f4df4f2e81677afb64d9aceb703c37bffb5bc3..2ce532ed8f23329a4c816e734c65eff28744bac7 100644
--- a/src/plugins/priority/multifactor/Makefile.in
+++ b/src/plugins/priority/multifactor/Makefile.in
@@ -244,7 +244,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 018c8f1018581c217b0948ba8c26065af29cf224..b7edb3826d8d237571c5acc1b97261985cf55a46 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index f51770c84d27ef8b17b45d1dc5046ef8d53f69d5..0c17bf9016177c8d01c2aea41e04fb99ca3fccc5 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index 75bf676df58f45b3e6848e8574d4d7220164905f..578f033a31325f4a3057a7d684684914393f5668 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -244,7 +244,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/proctrack/lua/Makefile.in b/src/plugins/proctrack/lua/Makefile.in
index ff56ab61d301c11dea44891b1bf92f171076bea2..f5e5c79143e73b22487d5eb40c9c1ff9faa5f21d 100644
--- a/src/plugins/proctrack/lua/Makefile.in
+++ b/src/plugins/proctrack/lua/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 08bfcb4d0d58cd784ba3a7661e3696b19195b0c1..bf15bf77a10df7743483d39b2e346aaffd7be1ad 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index 163f74cefc8bb290e2a7a08f8f7bf2bc55347671..4e64d654a379397762899e7c6192f92b3667e630 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -244,7 +244,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index 3440b4c9fec4886f29b274b0038f2013e8fbdb52..b90dc05a45b03c176503ec1fb33c09742c776446 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index 98078453aa5ff1d72c5f9a96645bef442a4c04a9..f2166614accac8d9bf155e85c038d439aa8ab99e 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 84a54976abeb6ee0004021c4a33444127dc07872..1dca0cea270efeb79696bb8cdbcf6af9f7bb19fb 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index d49772d5481282c792e86f753443b071c93b75c4..69e0c30e4e7fc4dd54c85ac45818687f38d0566d 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index dbe8064b2c020dc0cb60b50b1272bb4077aab6e9..a734ae4d9738f3a5ddc18c44116637e183d7b10e 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index a1305bfb2adc8a46554614de5c736aef31e07f79..326ad3b078c28a4e866b41b9a6b158b6d6479ea6 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -245,7 +245,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index 20654f183908d183d9989f5af9e06a94fe087fdb..28c5d812bf636089028d1e409810735cb9290e5b 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -248,7 +248,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index 1e1ea872d385342ae8df0d5b8cc7145d452dd66d..f3e4aa5ea282454553d031a5582420023ff662cd 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 64369e31336d9e7872790ec4695bcd32cd01fab5..3164e8f289d7dcea6c5948afeccf1ff6dc0430c8 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index bcd070e50512b7fb2ab02a62063f3f9c74197acb..20981ecdf52f6161b8f375c04dd3fddf46832f9d 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -235,7 +235,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index 7cbeeae36f53c91b342cdef8ae142f0d8fb0a427..22d7bf84ef90f68818427426cfd2f9628d1bfe9d 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -310,7 +310,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index 59670519048048702e7685a977384e0aa7c94aa5..b9459d4335f0da688de43455ea65d51206347d62 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -244,7 +244,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 9f1a82c3a686319a12846f1bcc0e0ff2ce18c374..6bcfa4e4f774507352d7ad303eb8692b9d502dfa 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 3a4ed580150cfce9d34c18806b4e5f34eb0ea27b..56684ffefa5fd4ec201bc2c682f9dfa49ed1fc63 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index 265c0f85f916b6cf9f21df48525baed5f66eb8ac..9731beac9dc3c29befbed22c43c4d7919f383758 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -249,7 +249,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 3cd763a2be2f521cf310b9852348722684bb5b7a..8aac368f1182bf3dcb782d6879d632799746fb2c 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -252,7 +252,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 4a5c2cf899fd53b05e6eeb683854d7ba8a5642da..e23b9915ab8fb8ce8567dbac6ad277df986c1678 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index 3e9c1cfc3754c27ea557da378a527c8868dee9dc..04f8a6b2cad2a403efb95a53b507020fa0190030 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index 76b9d4f1d64d00fbea08243f0f472a54569e6b08..5f2aa10f305616c1aeace97fe3361334db4a741d 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -255,7 +255,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index aa9f1f9da698411cbb07e9629e8627fa9a5c32e7..3ae308028430c41b17e3cf04da746092e4efe57d 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/topology/3d_torus/Makefile.in b/src/plugins/topology/3d_torus/Makefile.in
index b808c7f7f060d411745de89c4ba65a86199a4aff..795107646e08b0f28b03414858911ce56589e802 100644
--- a/src/plugins/topology/3d_torus/Makefile.in
+++ b/src/plugins/topology/3d_torus/Makefile.in
@@ -244,7 +244,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/topology/Makefile.in b/src/plugins/topology/Makefile.in
index 169ad6b2ecba82d25b5932dda1b690df7dc54130..3fe9550a6f9836bf0a3228a9d81ff41ced546113 100644
--- a/src/plugins/topology/Makefile.in
+++ b/src/plugins/topology/Makefile.in
@@ -238,7 +238,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/topology/none/Makefile.in b/src/plugins/topology/none/Makefile.in
index 2aff5ea5b256039ed4e673bdb45939ba3051c16a..bbe4a1f8bdf8b04c9533f75c1c276b89d6fc4c39 100644
--- a/src/plugins/topology/none/Makefile.in
+++ b/src/plugins/topology/none/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/plugins/topology/tree/Makefile.in b/src/plugins/topology/tree/Makefile.in
index 51cb109f4eab4ba60894c06cf9c95fee53b6daaa..c83196d72c1b51cd1f287cd5b4fa62275e9f60a3 100644
--- a/src/plugins/topology/tree/Makefile.in
+++ b/src/plugins/topology/tree/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index d0307e5a9ae575bd269c0e10cf4a6fb30d64361d..81c2617fde692859162b13e1b9b11ae5c248a970 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -227,7 +227,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sacctmgr/Makefile.in b/src/sacctmgr/Makefile.in
index e1b8745119204b52ae70dcab806c022fb6f1693f..cc43666bea1d75413de34d53f8bd654095f5b5ae 100644
--- a/src/sacctmgr/Makefile.in
+++ b/src/sacctmgr/Makefile.in
@@ -231,7 +231,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index d7a6166cf715e851cff64834f31b06233fe69a14..2dc6d0dd053ea57e68bf7b4261ee6fe31b62c648 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -224,7 +224,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index f77ccecef96ceb2456390e880632c76718104e9e..3c30611d3ebf8d6cf9626f03cf82afa271d0443b 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -225,7 +225,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index ed3cf82750f602541067ba3e71355e6a93451990..72c302a66b9a110d3f5125f9beeee5a8ab63ef93 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -224,7 +224,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 35073649cb97c5e4413eb3e99a007dd881f3a152..bf9cb58d07de0ab22818a01818b26e171857035f 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -227,7 +227,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index 391fb291c158d867c77f7a891c2eac2e63607711..17ad5d4b1d09ddd9f6d9a03523396546ea428da0 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -226,7 +226,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index 54a41e9bf49bb07f98bb30fc4ef9054859c4bb89..05db4a5515a95896b063b714d73042a7041aa268 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -228,7 +228,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index b8bb80468bfdb8e0abc049e136534530f1b6872a..b886d7535d94b3f716036465ce8c2e4526418d33 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -228,7 +228,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index 9316845807e3abe607cef44e35e4257b0693a56b..c97a4bcdda50cd9eb38b0775ee310c5be7182655 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -234,7 +234,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 667f8b7c9afdd4a300523625c723613c0be080fd..7b77696581b44b28fc91fff3fb4699b392d04c46 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -236,7 +236,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index cd8bbeb95980b3f7955c19cfc3dc637c84d17e0b..59af86de5840cabb3edc4eb17cc03602cd5222a7 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -231,7 +231,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index 2569e5bd2da7cf7a43f85dfdd1d72684fdc8c189..9d9b4be30d6228c3f70f7f33a32369f26aa2cb5e 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -234,7 +234,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in
index bb81d61aea88af8045f81df3e0183c06d6ad27bc..d34fe6d67e3c607277f74ea2e1a05ae06e199ca0 100644
--- a/src/slurmdbd/Makefile.in
+++ b/src/slurmdbd/Makefile.in
@@ -227,7 +227,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 23e75dddf285165d743968722359de437fec1e10..c05a33b0e18fc414cb1d996b60353e326ab2a5f0 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -244,7 +244,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sprio/Makefile.in b/src/sprio/Makefile.in
index 8b921e5fd7673078ba167040ed81d9e9baac964f..0236a88f9900f38212617e9151f27984bc107172 100644
--- a/src/sprio/Makefile.in
+++ b/src/sprio/Makefile.in
@@ -227,7 +227,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index a4e7d2099ef9922b43bc4037f0b837a6d7e08cd0..a17c4ea86931d712b6e4e78e421df78be50a6d10 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -228,7 +228,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sreport/Makefile.in b/src/sreport/Makefile.in
index 7338b9aa87f95c88466fa9b882a730a3e98f6c63..88c5d596e0cbe5b457ea2759518c3fbea0b443d7 100644
--- a/src/sreport/Makefile.in
+++ b/src/sreport/Makefile.in
@@ -227,7 +227,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index d511c58bcd71f9c793848fdb5070a69bca8d605f..bb74b3a29c2f23058afbce9bd25b3001bdb98a14 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -227,7 +227,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/srun_cr/Makefile.in b/src/srun_cr/Makefile.in
index 3db67b608d5ff7df6d053c67cef15f47a5338caf..c6d38ddccb1fe410378bb1c732f89b72d0571d8f 100644
--- a/src/srun_cr/Makefile.in
+++ b/src/srun_cr/Makefile.in
@@ -225,7 +225,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in
index 330f0f91881e74b2ac16050139d7414818098964..7fbbf86a670d448d6274dcf678f558655fdb1641 100644
--- a/src/sshare/Makefile.in
+++ b/src/sshare/Makefile.in
@@ -225,7 +225,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in
index 52a3b0595fe1d59fd22c740c9612c5d46bd6a634..e18e5b06ad5fffacedd7503c7fad49f984c9e294 100644
--- a/src/sstat/Makefile.in
+++ b/src/sstat/Makefile.in
@@ -227,7 +227,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index 8db1144b2c123e30db95a95dd5b96f583785050a..a8964db9cd9f6d311923d0c31b856b5deff9a4bc 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -227,7 +227,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index 5cd560ee9810cf5cf32d65c97a749b46406cab2e..a87fd2fbd319312020784b096c2a532d33578b37 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -247,7 +247,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index abf8f4e36b7fddae520982e44667048e709f8982..8cb59015e9e824420cefa03fd277e2b3e477a126 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -243,7 +243,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index 211aad2d062b4c130560a5b5c8436fdc281154bc..b413596cf8da0b949e867d7ef854256f5f8e19f2 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -196,7 +196,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index 89885c6c641655053e2330a882eaccb1e533ca69..7e9e7ee197770261ec5ac67e16e0cad87f97154f 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -236,7 +236,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index f1cb333e3ad13ee45d3332ba4fedd5bb3554cbda..9f29e2e17c69d9bf7a42d60da7b67c1f642f4df4 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -259,7 +259,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index cdcd693ec7a7e416ee83b2ed13db8d355d3f7ca5..3f768f89de21a0759001a534f0803154c36678d1 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -251,7 +251,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index 52d3dd87a93c766b7ecefc270baa7db251ead876..71343e3ba630011ea455c6c1b7e40cbaa1e65715 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -239,7 +239,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/slurm_unit/slurmctld/Makefile.in b/testsuite/slurm_unit/slurmctld/Makefile.in
index 7a68a667ff35f6be1078afd348956000d55a5222..92e49c5efbd438dc7e6b9032bec02cfada78b5e6 100644
--- a/testsuite/slurm_unit/slurmctld/Makefile.in
+++ b/testsuite/slurm_unit/slurmctld/Makefile.in
@@ -201,7 +201,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/slurm_unit/slurmd/Makefile.in b/testsuite/slurm_unit/slurmd/Makefile.in
index 7279ca224d86afdb5623dc5e1de3c55698f9e053..279abbec3be3a5c9fde5e5bab4a287451b13ecf3 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.in
+++ b/testsuite/slurm_unit/slurmd/Makefile.in
@@ -201,7 +201,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@
diff --git a/testsuite/slurm_unit/slurmdbd/Makefile.in b/testsuite/slurm_unit/slurmdbd/Makefile.in
index 213b14b42b626e33224ef03f426b24b21d89ee92..9871a7849438169a812f3dcbe3cf4028db62f821 100644
--- a/testsuite/slurm_unit/slurmdbd/Makefile.in
+++ b/testsuite/slurm_unit/slurmdbd/Makefile.in
@@ -201,7 +201,7 @@ SLURM_MAJOR = @SLURM_MAJOR@
SLURM_MICRO = @SLURM_MICRO@
SLURM_MINOR = @SLURM_MINOR@
SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION = @SLURM_VERSION@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
SO_LDFLAGS = @SO_LDFLAGS@
SSL_CPPFLAGS = @SSL_CPPFLAGS@