@@ -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
196196MODULES_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)
198198MODULES_LAST_RPM_RELEASE := $(lastword $(subst -, ,$(MODULES_LAST_RPM_VERSREL ) ) )
199199MODULES_RPM_RELEASE := $(MODULES_LAST_RPM_RELEASE )$(subst +,.,$(subst -,.,$(MODULES_BUILD ) ) )
200200
@@ -476,7 +476,7 @@ Makefile.inc: ;
476476version.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
482482tcl/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
530530modulecmd.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'
711711endif
712712ifeq ($(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)/'
719719endif
720720 $(MAKE) -C init install DESTDIR='$(DESTDIR)'
721721ifneq ($(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
803803dist-gzip : dist-tar
804804 $(ECHO_GEN2 ) $(DIST_PREFIX ) .tar.gz
@@ -878,7 +878,7 @@ ifneq ($(builddoc),n)
878878 $(MAKE) -C doc clean
879879endif
880880 rm -f version.inc
881- rm -f contrib /rpm/environment-modules.spec
881+ rm -f share /rpm/environment-modules.spec
882882ifneq ($(wildcard lib/Makefile) ,)
883883 $(MAKE) -C lib clean
884884endif
@@ -909,7 +909,7 @@ ifeq ($(multilibsupport),y)
909909else
910910 sed -e 's|$(libdir)|lib|' $< > $@
911911endif
912- sed -i -e 's|$(nagelfardatadir)|contrib /nagelfar|g' $@
912+ sed -i -e 's|$(nagelfardatadir)|share /nagelfar|g' $@
913913
914914tcl/% .tcl_i : tcl/% .tcl $(NAGELFAR )
915915 $(ECHO_GEN )
@@ -1091,7 +1091,7 @@ ifeq ($(VERBOSE),1)
10911091V = 1
10921092endif
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 \
0 commit comments