Skip to content

Commit 9206a16

Browse files
committed
Rename "contrib" directory into "share"
Give a more clear name to the "contrib" directory that contains architecture and configuration independent data. New directory name is "share", which correctly matches the destination of these files into the installation directory.
1 parent 3b68dee commit 9206a16

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+105
-106
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
/coverage
4141
/site.exp
4242
/localtest
43-
/contrib/rpm/environment-modules.spec
43+
/share/rpm/environment-modules.spec
4444
/script/add.modules
4545
/script/gitlog2changelog.py
4646
/script/modulecmd
47-
/contrib/modulefiles/modules
48-
/contrib/modulefiles/version
47+
/share/modulefiles/modules
48+
/share/modulefiles/version
4949
/testsuite/example/.modulespath
5050
/testsuite/example/modulespath-wild
5151
/testsuite/example/modulerc

Makefile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ endif
194194
# determine RPM release
195195
# use last release if we currently sat on tag, append build number to it elsewhere
196196
MODULES_LAST_RPM_VERSREL := $(shell sed -n '/^%changelog/ {n;s/^\*.* - //p;q;}' \
197-
contrib/rpm/environment-modules.spec.in)
197+
share/rpm/environment-modules.spec.in)
198198
MODULES_LAST_RPM_RELEASE := $(lastword $(subst -, ,$(MODULES_LAST_RPM_VERSREL)))
199199
MODULES_RPM_RELEASE := $(MODULES_LAST_RPM_RELEASE)$(subst +,.,$(subst -,.,$(MODULES_BUILD)))
200200

@@ -476,7 +476,7 @@ Makefile.inc: ;
476476
version.inc: version.inc.in $(GIT_REFRESH_PREREQ)
477477
$(translate-in-script)
478478

479-
contrib/rpm/environment-modules.spec: contrib/rpm/environment-modules.spec.in $(GIT_REFRESH_PREREQ)
479+
share/rpm/environment-modules.spec: share/rpm/environment-modules.spec.in $(GIT_REFRESH_PREREQ)
480480
$(translate-in-script)
481481

482482
tcl/cache.tcl: tcl/cache.tcl.in version.inc
@@ -524,7 +524,7 @@ tcl/subcmd.tcl_i: tcl/subcmd.tcl $(NAGELFAR)
524524
$(ECHO_GEN)
525525
rm -f $<_log
526526
$(NAGELFAR) -instrument $<
527-
sed -i -e 's|$(nagelfardatadir)|contrib/nagelfar|g' $@
527+
sed -i -e 's|$(nagelfardatadir)|share/nagelfar|g' $@
528528

529529
# join all tcl/*.tcl files to build modulecmd.tcl
530530
modulecmd.tcl: tcl/cache.tcl tcl/coll.tcl tcl/envmngt.tcl tcl/init.tcl \
@@ -705,17 +705,17 @@ ifeq ($(vimaddons),y)
705705
$(INSTALL_DIR) '$(DESTDIR)$(vimdatadir)/ftdetect'
706706
$(INSTALL_DIR) '$(DESTDIR)$(vimdatadir)/ftplugin'
707707
$(INSTALL_DIR) '$(DESTDIR)$(vimdatadir)/syntax'
708-
$(INSTALL_DATA) contrib/vim/ftdetect/modulefile.vim '$(DESTDIR)$(vimdatadir)/ftdetect'
709-
$(INSTALL_DATA) contrib/vim/ftplugin/modulefile.vim '$(DESTDIR)$(vimdatadir)/ftplugin'
710-
$(INSTALL_DATA) contrib/vim/syntax/modulefile.vim '$(DESTDIR)$(vimdatadir)/syntax'
708+
$(INSTALL_DATA) share/vim/ftdetect/modulefile.vim '$(DESTDIR)$(vimdatadir)/ftdetect'
709+
$(INSTALL_DATA) share/vim/ftplugin/modulefile.vim '$(DESTDIR)$(vimdatadir)/ftplugin'
710+
$(INSTALL_DATA) share/vim/syntax/modulefile.vim '$(DESTDIR)$(vimdatadir)/syntax'
711711
endif
712712
ifeq ($(nagelfaraddons),y)
713713
$(INSTALL_DIR) '$(DESTDIR)$(nagelfardatadir)'
714-
$(INSTALL_DATA) contrib/nagelfar/plugin_modulefile.tcl '$(DESTDIR)$(nagelfardatadir)/'
715-
$(INSTALL_DATA) contrib/nagelfar/plugin_modulerc.tcl '$(DESTDIR)$(nagelfardatadir)/'
716-
$(INSTALL_DATA) contrib/nagelfar/plugin_globalrc.tcl '$(DESTDIR)$(nagelfardatadir)/'
717-
$(INSTALL_DATA) contrib/nagelfar/syntaxdb_modulefile.tcl '$(DESTDIR)$(nagelfardatadir)/'
718-
$(INSTALL_DATA) contrib/nagelfar/syntaxdb_modulerc.tcl '$(DESTDIR)$(nagelfardatadir)/'
714+
$(INSTALL_DATA) share/nagelfar/plugin_modulefile.tcl '$(DESTDIR)$(nagelfardatadir)/'
715+
$(INSTALL_DATA) share/nagelfar/plugin_modulerc.tcl '$(DESTDIR)$(nagelfardatadir)/'
716+
$(INSTALL_DATA) share/nagelfar/plugin_globalrc.tcl '$(DESTDIR)$(nagelfardatadir)/'
717+
$(INSTALL_DATA) share/nagelfar/syntaxdb_modulefile.tcl '$(DESTDIR)$(nagelfardatadir)/'
718+
$(INSTALL_DATA) share/nagelfar/syntaxdb_modulerc.tcl '$(DESTDIR)$(nagelfardatadir)/'
719719
endif
720720
$(MAKE) -C init install DESTDIR='$(DESTDIR)'
721721
ifneq ($(builddoc),n)
@@ -789,7 +789,7 @@ endif
789789

790790
# include pre-generated documents not to require documentation build
791791
# tools when installing from dist tarball
792-
dist-tar: ChangeLog.gz contrib/rpm/environment-modules.spec pkgdoc
792+
dist-tar: ChangeLog.gz share/rpm/environment-modules.spec pkgdoc
793793
$(ECHO_GEN2) $(DIST_PREFIX).tar
794794
git archive --prefix=$(DIST_PREFIX)/ --worktree-attributes \
795795
-o $(DIST_PREFIX).tar HEAD
@@ -798,7 +798,7 @@ dist-tar: ChangeLog.gz contrib/rpm/environment-modules.spec pkgdoc
798798
doc/build/MIGRATING.txt doc/build/changes.txt doc/build/INSTALL.txt \
799799
doc/build/INSTALL-win.txt doc/build/NEWS.txt doc/build/CONTRIBUTING.txt \
800800
doc/build/module.1.in doc/build/ml.1 doc/build/modulefile.5 \
801-
contrib/rpm/environment-modules.spec
801+
share/rpm/environment-modules.spec
802802

803803
dist-gzip: dist-tar
804804
$(ECHO_GEN2) $(DIST_PREFIX).tar.gz
@@ -878,7 +878,7 @@ ifneq ($(builddoc),n)
878878
$(MAKE) -C doc clean
879879
endif
880880
rm -f version.inc
881-
rm -f contrib/rpm/environment-modules.spec
881+
rm -f share/rpm/environment-modules.spec
882882
ifneq ($(wildcard lib/Makefile),)
883883
$(MAKE) -C lib clean
884884
endif
@@ -909,7 +909,7 @@ ifeq ($(multilibsupport),y)
909909
else
910910
sed -e 's|$(libdir)|lib|' $< > $@
911911
endif
912-
sed -i -e 's|$(nagelfardatadir)|contrib/nagelfar|g' $@
912+
sed -i -e 's|$(nagelfardatadir)|share/nagelfar|g' $@
913913

914914
tcl/%.tcl_i: tcl/%.tcl $(NAGELFAR)
915915
$(ECHO_GEN)
@@ -1091,7 +1091,7 @@ ifeq ($(VERBOSE),1)
10911091
V = 1
10921092
endif
10931093
# let verbose by default the install/clean/test and other specific non-build targets
1094-
$(V).SILENT: initdir pkgdoc doc version.inc contrib/rpm/environment-modules.spec \
1094+
$(V).SILENT: initdir pkgdoc doc version.inc share/rpm/environment-modules.spec \
10951095
modulecmd.tcl tcl/cache.tcl tcl/coll.tcl tcl/envmngt.tcl tcl/init.tcl \
10961096
tcl/interp.tcl tcl/main.tcl tcl/modfind.tcl tcl/report.tcl tcl/subcmd.tcl \
10971097
tcl/cache.tcl_i tcl/coll.tcl_i tcl/envmngt.tcl_i tcl/init.tcl_i tcl/interp.tcl_i \

doc/source/design/add-new-sub-command.rst

Lines changed: 1 addition & 1 deletion

init/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CSH_LIKE = csh tcsh tcsh_completion profile.csh
1414
OTHER = perl.pm python.py ruby.rb lisp tcl fish cmake r.R pwsh.ps1
1515

1616
# example modulefiles to install
17-
EXAMPLE_MODFILES_SRCDIR := ../contrib/modulefiles
17+
EXAMPLE_MODFILES_SRCDIR := ../share/modulefiles
1818
EXAMPLE_MODFILES = dot module-git module-info modules null use.own
1919
EXAMPLE_WIN_MODFILES = module-git module-info null
2020
EXAMPLE_TESTCONFIG_MODFILES = null

script/mrel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ file delete log-gz log-bz log-win $prevdistgz distfiles distfiles-win\
272272
log-prev-gz distfiles-prev $prevdistwin log-prev-win distfiles-win-prev
273273

274274
# check generated RPM spec file
275-
runcmd >@stdout rpmlint -r contrib/rpm/environment-modules.rpmlintrc\
276-
contrib/rpm/environment-modules.spec
275+
runcmd >@stdout rpmlint -r share/rpm/environment-modules.rpmlintrc\
276+
share/rpm/environment-modules.spec
277277
quitorcont
278278

279279

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)