Issue #679: set the correct sType for modules from prereq/conflict re…

…quests
TACC · Mar 18, 2024 · 400d501 · 400d501
1 parent 14bf09e
commit 400d501
Show file tree

Hide file tree

Showing 19 changed files with 2,567 additions and 2,271 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -72,6 +72,7 @@ AUTO_SWAP                 := @AUTO_SWAP@
 SPIDER_CACHE_DIRS         := @SPIDER_CACHE_DIRS@
 LEGACY_ORDERING           := @LEGACY_ORDERING@
 EXPORT_MODULE             := @EXPORT_MODULE@
+LMOD_PERMANENT_CONFLICTS  := @LMOD_PERMANENT_CONFLICTS@
 BASENAME                  := @BASENAME@
 UPDATE_VERSION            := LUA_PATH="$(srcdir)/tools/?.lua;$(SYS_LUA_PATH)" $(PATH_TO_LUA) $(srcdir)/proj_mgmt/updateVersion
 BUILD_V_src               := LUA_PATH="$(srcdir)/tools/?.lua;$(SYS_LUA_PATH)" LUA_CPATH="$(SYS_LUA_CPATH)" $(PATH_TO_LUA) $(srcdir)/proj_mgmt/buildVersion_src
@@ -288,6 +289,7 @@ __installMe:
 	        -e 's|@fast_tcl_interp@|$(FAST_TCL_INTERP)|g'                     \
 	        -e 's|@settarg_cmd@|$(SETTARG_CMD)|g'                             \
 	        -e 's|@lmod_config_dir@|$(LMOD_CONFIG_DIR)|g'                     \
+	        -e 's|@lmod_permanent_conflicts@|$(LMOD_PERMANENT_CONFLICTS)|g'   \
 	        -e "s|@my_shell@|$$fn|g"                                          \
 	        -e 's|@tclsh@|$(PATH_TO_TCLSH)|g'                                 \
 	        -e 's|@ls@|$(PATH_TO_LS)|g'                                       \