From 95a469d453dfd60819eaa60fdddd08a0b7446e60 Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Wed, 21 Jul 2021 15:09:39 +0200
Subject: [PATCH] script: remove compat version-related code in mrel/mpub

---
 script/mpub |  2 +-
 script/mrel | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/script/mpub b/script/mpub
index 9a45c240..0de54516 100755
--- a/script/mpub
+++ b/script/mpub
@@ -164,7 +164,7 @@ file delete dlcheck
 
 if {[catch {runcmd make distclean} errmsg]} {
    # skip error if things have already been cleaned up
-   ignoreexp $errmsg {Makefile:37: *** Makefile.inc is missing, please run\
+   ignoreexp $errmsg {Makefile:34: *** Makefile.inc is missing, please run\
       './configure'.  Stop.}
 }
 runcmd 2>@$logfid git checkout gh-pages
diff --git a/script/mrel b/script/mrel
index d3b257c2..80331772 100755
--- a/script/mrel
+++ b/script/mrel
@@ -171,16 +171,10 @@ runcmd sudo rm -rf /usr/local/Modules
 
 if {[catch {runcmd make distclean} errmsg]} {
    # skip error if things have already been cleaned up
-   ignoreexp $errmsg {Makefile:37: *** Makefile.inc is missing, please run\
+   ignoreexp $errmsg {Makefile:34: *** Makefile.inc is missing, please run\
       './configure'.  Stop.}
 }
-if {[catch {runcmd ./configure --enable-compat-version} errmsg]} {
-   # ignore stderr output which is not an error
-   ignoreexp $errmsg "configure.ac:172: installing\
-      'config/compile'\nconfigure.ac:16: installing\
-      'config/install-sh'\nconfigure.ac:16: installing\
-      'config/missing'\nMakefile.am: installing 'config/depcomp'"
-}
+runcmd ./configure
 
 # download icdiff to compare files
 runcmd >&@$logfid make icdiff
@@ -267,7 +261,7 @@ cd /tmp/mods+test-gz
 runcmd tar xfz $cwd/$distgz
 cd modules-$relver
 reportInfo "Moved into '[pwd]' directory"
-runcmd ./configure --enable-compat-version
+runcmd ./configure
 runcmd make
 runcmd 2>@$logfid script/mt
 runcmd 2>@$logfid sudo make install
@@ -292,7 +286,7 @@ runcmd 2>@$logfid git clone $ghcloneurl
 cd modules
 reportInfo "Moved into '[pwd]' directory"
 runcmd 2>@$logfid git checkout $relbranch
-runcmd 2>@$logfid ./configure --enable-compat-version
+runcmd 2>@$logfid ./configure
 runcmd make
 runcmd 2>@$logfid script/mt
 runcmd 2>@$logfid sudo make install
@@ -321,8 +315,7 @@ reportInfo "Moved back into '[pwd]' directory"
 # ---------------------------------------------------------
 
 runcmd 2>@$logfid rpmbuild --rebuild $srcrpm
-foreach rpm [glob $rpmdir/environment-modules-$relver-1.*.rpm\
-   $rpmdir/environment-modules-compat-$relver-1.*.rpm] {
+foreach rpm [glob $rpmdir/environment-modules-$relver-1.*.rpm] {
    runcmd >@stdout rpm -qlp $rpm | less -eFKRX
    quitorcont
    # check installation of built RPM