rpm/Modules
SHA256
1
0
Fork 0
forked from pool/Modules
Code Pull Requests Activity

Accepting request 597233 from home:bmanojlovic:branches:systemsmanagement

Browse Source 
- too many changes to put into changelog please read Changelog in
  /usr/share/doc/packages/Modules-doc/ChangeLog (installed from
  Modules-doc package)
- removed return.patch
- removed share.patch
- reworked return.patch and renamed to modules-4.1.2-return.patch
- reworked fixing-bashisms patch for current version

OBS-URL: https://build.opensuse.org/request/show/597233
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/Modules?expand=0&rev=23
This commit is contained in:
Klaus Kämpf 2018-04-17 06:18:16 +00:00 committed by Git OBS Bridge
parent 1b0c3c2600
commit 159637be41
9 changed files with 101 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Apr 16 19:24:51 UTC 2018 - boris@steki.net
- too many changes to put into changelog please read Changelog in
/usr/share/doc/packages/Modules-doc/ChangeLog (installed from
Modules-doc package)
- removed return.patch
- removed share.patch
- reworked return.patch and renamed to modules-4.1.2-return.patch
- reworked fixing-bashisms patch for current version
-------------------------------------------------------------------
Sun Nov 16 20:50:00 UTC 2014 - Led <ledest@gmail.com>

119
Modules.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package Modules
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,24 +18,32 @@
Name: Modules
BuildRequires: automake
BuildRequires: less
BuildRequires: procps
BuildRequires: tcl-devel
# xorg-x11-devel
Url: http://modules.sourceforge.net/
Version: 3.2.10
Version: 4.1.2
Release: 0
Summary: Environment Modules
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+
Summary: Change environment at runtime
License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Management
Requires: tcl
Source: modules-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE share.patch
Patch0: share.patch
# PATCH-FIX-UPSTREAM return.patch
Patch1: return.patch
Patch2: modules-3.2.10-fix-bashisms.patch
Source: https://download.sourceforge.net/project/modules/Modules/modules-%{version}/modules-%{version}.tar.gz
# PATCH-FIX-UPSTREAM modules-4.1.2-return.patch
Patch1: modules-4.1.2-return.patch
# PATCH-FIX-UPSTREAM modules-4.1.2-fix-bashisms.patch
Patch2: modules-4.1.2-fix-bashisms.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules
Obsoletes: environment-modules < %{version}
%if 0%{?suse_version}
Recommends: %{name}-doc
%endif
%if 0%{?redhat_version}
BuildRequires: perl(Digest::MD5)
%endif
%description
The Modules package provides for dynamic modification of a user's
@ -49,44 +57,36 @@ may be shared by many users on a system and users may have their own
collection to supplement or replace the shared module files. The
modules environment is common on SGI/Crays and many workstation farms.
%package doc
Summary: Documentation for Change environment at runtime
Group: System/Management
Authors:
--------
John L. Furlan <jlf@behere.com>
Peter W. Osel <pwo@Osel.DE>
Jens Hamisch <Jens.Hamisch@Strawberry.COM>
R.K. Owen <rk@owen.sj.ca.us>
%description doc
The Modules package provides for dynamic modification of a user's
environment with module files. Each module file contains the
information needed to configure the shell for an application. Once the
package is initialized, the environment can be modified dynamically on
a per-module basis using the module command that interprets module
files. Typically, module files instruct the module command to alter or
set shell environment variables, such as PATH or MANPATH. Module files
may be shared by many users on a system and users may have their own
collection to supplement or replace the shared module files. The
modules environment is common on SGI/Crays and many workstation farms.
%prep
%setup -q -n modules-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch1
%patch2
sed -i 's@/usr/bin/env bash@/bin/bash@' contrib/envml
%build
# Remove overzealous use of "dnl" (+++), which caused
# a broken "configure" (---) being generated.
#@@ -3004,7 +3004,8 @@ to "yes", and re-run configure.
# END
# as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
# fi
#-fiac_config_headers="$ac_config_headers config.h"
#+fi
#+ac_config_headers="$ac_config_headers config.h"
#
# # Check whether --enable-versioning was given.
# if test "${enable_versioning+set}" = set; then :
#
perl -i -pe 's{dnl\n}{\n}gs' configure.ac
aclocal --force -I config
autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" \
./configure \
--initdir="%{_datadir}/%name/init" \
--libexecdir="%{_prefix}/%_lib/%{name}/" \
--prefix="%_prefix" \
--with-version-path="%_datadir/modules" \
--with-module-path="%_datadir/modules/modulefiles" \
--with-version-path="%_datadir/%{name}" \
--modulefilesdir="%{_datadir}/%{name}/modulefiles" \
--mandir=%{_mandir} \
--with-etc-path="%_sysconfdir" \
--with-skel-path="%_sysconfdir/skel" \
@ -97,29 +97,32 @@ make
%install
install -d $RPM_BUILD_ROOT/usr/share/modules
install -d $RPM_BUILD_ROOT/etc/profile.d
install -m 644 etc/global/profile.modules $RPM_BUILD_ROOT/etc/profile.d/modules.sh
install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh
sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.sh
sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.csh
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT/usr/bin
pushd $RPM_BUILD_ROOT/usr/bin
ln -s ../share/Modules/%{version}/bin/add.modules .
ln -s ../share/Modules/%{version}/bin/mkroot .
ln -s ../share/Modules/%{version}/bin/modulecmd .
popd
mv $RPM_BUILD_ROOT/usr/share/doc doc_dir
%files
%defattr(-,root,root)
%doc ChangeLog LICENSE.GPL NEWS README TODO
%dir %{_prefix}/share/Modules
%{_prefix}/share/Modules/*
%dir /usr/share/modules
/usr/share/modules/*
%{_bindir}/*
%config /etc/profile.d/modules.*
%doc %{_mandir}/man4/*
%doc %{_mandir}/man1/*
%doc doc_dir/README
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/modulefiles
%{_bindir}/add.modules
%{_bindir}/envml
%{_bindir}/mkroot
%{_bindir}/modulecmd
%{_datadir}/%{name}/init
%{_libdir}/%{name}/modulecmd-compat
%{_libdir}/%{name}/modulecmd.tcl
%{_datadir}/%{name}/modulefiles/*
%{_mandir}/man1/module-compat.1*
%{_mandir}/man1/module.1*
%{_mandir}/man4/modulefile-compat.4*
%{_mandir}/man4/modulefile.4*
%files doc
%defattr(-,root,root)
%doc doc_dir/COPYING.GPLv2 doc_dir/ChangeLog doc_dir/ChangeLog-compat doc_dir/INSTALL.txt doc_dir/example.txt
%doc doc_dir/MIGRATING.txt doc_dir/NEWS-compat doc_dir/NEWS.txt doc_dir/README doc_dir/diff_v3_v4.txt
%changelog

12
modules-3.2.10-fix-bashisms.patch
View File

@ -1,12 +0,0 @@
diff -Ndur modules-3.2.10/etc/add.modules.in modules-3.2.10-fix-bashisms/etc/add.modules.in
--- modules-3.2.10/etc/add.modules.in 2012-11-02 00:22:06.000000000 +0200
+++ modules-3.2.10-fix-bashisms/etc/add.modules.in 2014-11-16 22:48:55.863380526 +0200
@@ -114,7 +114,7 @@
findload $1.old
/bin/cat > $1 <<!
if ( -e $ETC/csh.modules ) then
- source $ETC/csh.modules
+ . $ETC/csh.modules
# put your own module loads here
!
if [ -s /tmp/load.$$ ]

3
modules-3.2.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8403492a8d57ace6485813ad6cdaafe0a735b7d93b9435553a8d11d3fdd29a2
size 327611

13
modules-4.1.2-fix-bashisms.patch Normal file
View File

@ -0,0 +1,13 @@
Index: compat/etc/add.modules.in
===================================================================
--- compat/etc/add.modules.in.orig 2018-03-31 18:22:47.000000000 +0200
+++ compat/etc/add.modules.in 2018-04-16 21:28:35.703722251 +0200
@@ -114,7 +114,7 @@ fi
findload $1.old
/bin/cat > $1 <<!
if ( -e $ETC/csh.modules ) then
- source $ETC/csh.modules
+ . $ETC/csh.modules
# put your own module loads here
!
if [ -s /tmp/load.$$ ]

12
modules-4.1.2-return.patch Normal file
View File

@ -0,0 +1,12 @@
Index: compat/ModuleCmd_Avail.c
===================================================================
--- compat/ModuleCmd_Avail.c.orig 2018-03-31 18:22:47.000000000 +0200
+++ compat/ModuleCmd_Avail.c 2018-04-16 21:08:24.521845828 +0200
@@ -690,6 +690,7 @@ static int check_cache( char *dir)
static int test_version_dir( struct dirent *dp)
{
+ return 0;
}
/*++++
** ** Function-Header ***************************************************** **

3
modules-4.1.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1f54f639d1946aa1d7ae8ae03752f8ac464a879c14bc35e63b6a87b8a0b7522
size 1356846

11
return.patch
View File

@ -1,11 +0,0 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/ModuleCmd_Avail.c ./ModuleCmd_Avail.c
--- ../orig-modules-3.2.10/ModuleCmd_Avail.c 2012-12-13 23:17:27.000000000 +0100
+++ ./ModuleCmd_Avail.c 2012-12-21 09:56:11.371774517 +0100
@@ -690,6 +690,7 @@
static int test_version_dir( struct dirent *dp)
{
+ return 0;
}
/*++++
** ** Function-Header ***************************************************** **

441
share.patch
View File

@ -1,441 +0,0 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/configure ./configure
--- ../orig-modules-3.2.10/configure 2012-12-19 18:02:25.000000000 +0100
+++ ./configure 2012-12-21 09:56:47.801240538 +0100
@@ -1494,9 +1494,9 @@
(tclExtend.h,...) [[none]]
--with-module-path=<path>
use module path=<path>
- [[PREFIX/Modules/modulefiles]]
+ [[PREFIX/share/Modules/modulefiles]]
--with-version-path=<path>
- use version path=<path> [[PREFIX/Modules/versions]]
+ use version path=<path> [[PREFIX/share/Modules/versions]]
--with-tmp-dir=<dir> use <dir> as a temporary dir [[/tmp]]
--with-man-path=<dir> use <dir> for the default MANPATH
[[/usr/man:/usr/share/man]]
@@ -1513,19 +1513,19 @@
Depending on the above configuration options the files are approximately
placed in the following directory structure :
-PREFIX/Modules/($MODULES_VERSION/ if modules-versioning)
+PREFIX/share/Modules/($MODULES_VERSION/ if modules-versioning)
bin/
init/
man/
man1/
man4/
modulefiles/
-PREFIX/Modules/
+PREFIX/share/Modules/
modulefiles/
(versions/ if modules-versioning)
System modulefiles can safely be placed in:
-PREFIX/Modules/modulefiles
+PREFIX/share/Modules/modulefiles
Some influential environment variables:
@@ -2922,31 +2922,31 @@
fi
if test "$prefix" != "NONE" ; then
if test "$WANTS_VERSIONING" -eq 1 ; then
- DEFAULTPATH=$prefix/Modules/default
- NODEFAULTPATH=$prefix/Modules/$VERSION
+ DEFAULTPATH=$prefix/share/Modules/default
+ NODEFAULTPATH=$prefix/share/Modules/$VERSION
BASEPREFIX=$prefix
- prefix=$BASEPREFIX/Modules/$VERSION
+ prefix=$BASEPREFIX/share/Modules/$VERSION
export prefix
else
- DEFAULTPATH=$prefix/Modules
- NODEFAULTPATH=$prefix/Modules
+ DEFAULTPATH=$prefix/share/Modules
+ NODEFAULTPATH=$prefix/share/Modules
BASEPREFIX=$prefix
- prefix=$BASEPREFIX/Modules
+ prefix=$BASEPREFIX/share/Modules
export prefix
fi
PREFIX=$prefix
else
if test "$WANTS_VERSIONING" -eq 1 ; then
- DEFAULTPATH=$ac_default_prefix/Modules/default
- NODEFAULTPATH=$ac_default_prefix/Modules/$VERSION
+ DEFAULTPATH=$ac_default_prefix/share/Modules/default
+ NODEFAULTPATH=$ac_default_prefix/share/Modules/$VERSION
BASEPREFIX=$ac_default_prefix
- ac_default_prefix=$BASEPREFIX/Modules/$VERSION
+ ac_default_prefix=$BASEPREFIX/share/Modules/$VERSION
export ac_default_prefix
else
- DEFAULTPATH=$ac_default_prefix/Modules
- NODEFAULTPATH=$ac_default_prefix/Modules
+ DEFAULTPATH=$ac_default_prefix/share/Modules
+ NODEFAULTPATH=$ac_default_prefix/share/Modules
BASEPREFIX=$ac_default_prefix
- ac_default_prefix=$BASEPREFIX/Modules
+ ac_default_prefix=$BASEPREFIX/share/Modules
export ac_default_prefix
fi
PREFIX=$ac_default_prefix
@@ -7516,7 +7516,7 @@
_ACEOF
else
- withval="$BASEPREFIX/Modules/modulefiles"
+ withval="$BASEPREFIX/share/Modules/modulefiles"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will use MODULEPATH=$withval : rerun configure using --with-module-path to override default" >&5
$as_echo "$as_me: WARNING: will use MODULEPATH=$withval : rerun configure using --with-module-path to override default" >&2;}
MODULEPATH="$withval"
@@ -7538,7 +7538,7 @@
else
if test "$WANTS_VERSIONING" -eq 1 ; then
- withval="$BASEPREFIX/Modules/versions"
+ withval="$BASEPREFIX/share/Modules/versions"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default" >&5
$as_echo "$as_me: WARNING: will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default" >&2;}
VERSIONPATH="$withval"
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/configure.ac ./configure.ac
--- ../orig-modules-3.2.10/configure.ac 2012-12-18 17:31:18.000000000 +0100
+++ ./configure.ac 2012-12-21 09:56:47.801240538 +0100
@@ -110,31 +110,31 @@
fi
if test "$prefix" != "NONE" ; then
if test "$WANTS_VERSIONING" -eq 1 ; then
- DEFAULTPATH=$prefix/Modules/default
- NODEFAULTPATH=$prefix/Modules/$VERSION
+ DEFAULTPATH=$prefix/share/Modules/default
+ NODEFAULTPATH=$prefix/share/Modules/$VERSION
BASEPREFIX=$prefix
- prefix=$BASEPREFIX/Modules/$VERSION
+ prefix=$BASEPREFIX/share/Modules/$VERSION
export prefix
else
- DEFAULTPATH=$prefix/Modules
- NODEFAULTPATH=$prefix/Modules
+ DEFAULTPATH=$prefix/share/Modules
+ NODEFAULTPATH=$prefix/share/Modules
BASEPREFIX=$prefix
- prefix=$BASEPREFIX/Modules
+ prefix=$BASEPREFIX/share/Modules
export prefix
fi
PREFIX=$prefix
else
if test "$WANTS_VERSIONING" -eq 1 ; then
- DEFAULTPATH=$ac_default_prefix/Modules/default
- NODEFAULTPATH=$ac_default_prefix/Modules/$VERSION
+ DEFAULTPATH=$ac_default_prefix/share/Modules/default
+ NODEFAULTPATH=$ac_default_prefix/share/Modules/$VERSION
BASEPREFIX=$ac_default_prefix
- ac_default_prefix=$BASEPREFIX/Modules/$VERSION
+ ac_default_prefix=$BASEPREFIX/share/Modules/$VERSION
export ac_default_prefix
else
- DEFAULTPATH=$ac_default_prefix/Modules
- NODEFAULTPATH=$ac_default_prefix/Modules
+ DEFAULTPATH=$ac_default_prefix/share/Modules
+ NODEFAULTPATH=$ac_default_prefix/share/Modules
BASEPREFIX=$ac_default_prefix
- ac_default_prefix=$BASEPREFIX/Modules
+ ac_default_prefix=$BASEPREFIX/share/Modules
export ac_default_prefix
fi
PREFIX=$ac_default_prefix
@@ -816,13 +816,13 @@
AH_TEMPLATE([MODULEPATH],[
MODULEPATH: Directory that contains all the system module files])dnl
AC_ARG_WITH(module-path,
- AC_HELP_STRING([--with-module-path=<path>],[use module path=<path> [[PREFIX/Modules/modulefiles]]]),
+ AC_HELP_STRING([--with-module-path=<path>],[use module path=<path> [[PREFIX/share/Modules/modulefiles]]]),
MODULEPATH="$withval"
AC_MSG_RESULT([MODULEPATH = $with_module_path])
AC_DEFINE_UNQUOTED(MODULEPATH, "$withval")dnl
,
dnl AC_MSG_WARN([if using '--with-module-path': need to specify a path!])
- withval="$BASEPREFIX/Modules/modulefiles"
+ withval="$BASEPREFIX/share/Modules/modulefiles"
AC_MSG_WARN([will use MODULEPATH=$withval : rerun configure using --with-module-path to override default])
MODULEPATH="$withval"
AC_DEFINE_UNQUOTED(MODULEPATH, "$withval"))dnl
@@ -833,14 +833,14 @@
AH_TEMPLATE([VERSIONPATH],[
VERSIONPATH: Directory that contains the env.modules version files.])dnl
AC_ARG_WITH(version-path,
- AC_HELP_STRING([--with-version-path=<path>],[use version path=<path> [[PREFIX/Modules/versions]]]),
+ AC_HELP_STRING([--with-version-path=<path>],[use version path=<path> [[PREFIX/share/Modules/versions]]]),
VERSIONPATH="$withval"
AC_MSG_RESULT([VERSIONPATH = $with_version_path])
AC_DEFINE_UNQUOTED(VERSIONPATH, "$withval")
,
if test "$WANTS_VERSIONING" -eq 1 ; then
dnl AC_MSG_WARN([if using '--with-version-path': need to specify a path!])
- withval="$BASEPREFIX/Modules/versions"
+ withval="$BASEPREFIX/share/Modules/versions"
AC_MSG_WARN([will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default])
VERSIONPATH="$withval"
AC_DEFINE_UNQUOTED(VERSIONPATH, "$withval")
@@ -961,19 +961,19 @@
Depending on the above configuration options the files are approximately
placed in the following directory structure :
-PREFIX/Modules/($MODULES_VERSION/ if modules-versioning)
+PREFIX/share/Modules/($MODULES_VERSION/ if modules-versioning)
bin/
init/
man/
man1/
man4/
modulefiles/
-PREFIX/Modules/
+PREFIX/share/Modules/
modulefiles/
(versions/ if modules-versioning)
System modulefiles can safely be placed in:
-PREFIX/Modules/modulefiles
+PREFIX/share/Modules/modulefiles
]])dnl
dnl ---------------------------------------------------------------------------
dnl Now put it all out!
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/add.modules.in ./etc/add.modules.in
--- ../orig-modules-3.2.10/etc/add.modules.in 2012-11-01 23:22:06.000000000 +0100
+++ ./etc/add.modules.in 2012-12-21 09:56:47.801240538 +0100
@@ -144,7 +144,7 @@
-zsh|zsh|*/zsh) modules_shell=zsh ;;
-bash|bash|*/bash) modules_shell=bash ;;
esac
-@VERSIONING@module() { eval \`@BASEPREFIX@/Modules/\$MODULE_VERSION/bin/modulecmd \$modules_shell \$*\`; }
+@VERSIONING@module() { eval \`@BASEPREFIX@/share/Modules/\$MODULE_VERSION/bin/modulecmd \$modules_shell \$*\`; }
@NOTVERSIONING@module() { eval \`@bindir@/modulecmd \$modules_shell \$*\`; }
!
elif [ x$3 = xcsh ]
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/global/bashrc.in ./etc/global/bashrc.in
--- ../orig-modules-3.2.10/etc/global/bashrc.in 2012-10-25 21:32:01.000000000 +0200
+++ ./etc/global/bashrc.in 2012-12-21 09:56:47.805240699 +0100
@@ -11,7 +11,7 @@
-zsh|zsh|*/zsh) modules_shell=zsh ;;
-bash|bash|*/bash) modules_shell=bash ;;
esac
-@VERSIONING@eval "module() { eval \`@BASEPREFIX@/Modules\$MODULE_VERSION/bin/modulecmd $modules_shell \$*\`; }"
+@VERSIONING@eval "module() { eval \`@BASEPREFIX@/share/Modules\$MODULE_VERSION/bin/modulecmd $modules_shell \$*\`; }"
@NOTVERSIONING@eval "module() { eval \`@bindir@/modulecmd $modules_shell \$*\`; }"
unset modules_shell
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/global/csh.cshrc.in ./etc/global/csh.cshrc.in
--- ../orig-modules-3.2.10/etc/global/csh.cshrc.in 2012-10-25 21:32:01.000000000 +0200
+++ ./etc/global/csh.cshrc.in 2012-12-21 09:56:47.805240699 +0100
@@ -10,7 +10,7 @@
set modules_shell="csh"
endif
-@VERSIONING@alias module 'eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
+@VERSIONING@alias module 'eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
@NOTVERSIONING@alias module 'eval `@bindir@/modulecmd '$modules_shell '\!*`'
unset modules_shell
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/skel/.cshrc.in ./etc/skel/.cshrc.in
--- ../orig-modules-3.2.10/etc/skel/.cshrc.in 2012-10-25 21:32:01.000000000 +0200
+++ ./etc/skel/.cshrc.in 2012-12-21 09:56:47.805240699 +0100
@@ -4,7 +4,7 @@
else
set modules_shell="csh"
endif
-@VERSIONING@alias module 'eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
+@VERSIONING@alias module 'eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
@NOTVERSIONING@alias module 'eval `@bindir@/modulecmd '$modules_shell '\!*`'
if (! $?prompt) exit #exit if not interactive
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/skel/.kshenv.in ./etc/skel/.kshenv.in
--- ../orig-modules-3.2.10/etc/skel/.kshenv.in 2012-10-25 21:32:01.000000000 +0200
+++ ./etc/skel/.kshenv.in 2012-12-21 09:56:47.805240699 +0100
@@ -4,7 +4,7 @@
-ksh|ksh|*/ksh) modules_shell=ksh ;;
-bash|bash|*/bash) modules_shell=bash ;;
esac
-@VERSIONING@eval "module() { eval `@BASEPREFIX@/Modules/\$MODULE_VERSION/bin/modulecmd $modules_shell $*`; }"
+@VERSIONING@eval "module() { eval `@BASEPREFIX@/share/Modules/\$MODULE_VERSION/bin/modulecmd $modules_shell $*`; }"
@NOTVERSIONING@eval "module() { eval `@bindir@/modulecmd $modules_shell $*`; }"
unset modules_shell
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/ext/common/.cshrc.in ./ext/common/.cshrc.in
--- ../orig-modules-3.2.10/ext/common/.cshrc.in 2012-10-25 21:32:01.000000000 +0200
+++ ./ext/common/.cshrc.in 2012-12-21 09:56:47.805240699 +0100
@@ -4,7 +4,7 @@
else
set modules_shell="csh"
endif
-alias module 'eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
+alias module 'eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
if ( -f $HOME/.cshrc.ext ) then
source $HOME/.cshrc.ext
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/ext/common/.kshenv.in ./ext/common/.kshenv.in
--- ../orig-modules-3.2.10/ext/common/.kshenv.in 2012-10-25 21:32:01.000000000 +0200
+++ ./ext/common/.kshenv.in 2012-12-21 09:56:47.805240699 +0100
@@ -4,7 +4,7 @@
-ksh|ksh|*/ksh) modules_shell=ksh ;;
-bash|bash|*/bash) modules_shell=bash ;;
esac
-module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd $modules_shell $*`; }
+module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd $modules_shell $*`; }
if [ -f ${ENV:-$HOME/.kshenv.ext} ]; then
. ${ENV:-$HOME/.kshenv.ext}
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/bash_completion.in ./init/bash_completion.in
--- ../orig-modules-3.2.10/init/bash_completion.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/bash_completion.in 2012-12-21 09:56:47.805240699 +0100
@@ -2,7 +2,7 @@
# Bash commandline completion (bash 3.0 and above) for Modules @VERSION@
#
_module_avail() {
-@VERSIONING@ @BASEPREFIX@/Modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
+@VERSIONING@ @BASEPREFIX@/share/Modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
@NOTVERSIONING@ @bindir@/modulecmd bash -t avail 2>&1 | sed '
/:$/d;
/:ERROR:/d;
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/bash.in ./init/bash.in
--- ../orig-modules-3.2.10/init/bash.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/bash.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@
@VERSIONING@fi
@VERSIONING@export MODULE_VERSION_STACK
-@VERSIONING@module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd bash $*`; }
+@VERSIONING@module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd bash $*`; }
@NOTVERSIONING@module() { eval `@bindir@/modulecmd bash $*`; }
export -f module
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/cmake.in ./init/cmake.in
--- ../orig-modules-3.2.10/init/cmake.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/cmake.in 2012-12-21 09:56:47.805240699 +0100
@@ -6,7 +6,7 @@
@VERSIONING@endif()
function(module ARGS)
-@VERSIONING@ set(exec_prefix "@BASEPREFIX@/Modules/$ENV{MODULE_VERSION}/bin")
+@VERSIONING@ set(exec_prefix "@BASEPREFIX@/share/Modules/$ENV{MODULE_VERSION}/bin")
@NOTVERSIONING@ set(exec_prefix "@bindir@")
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/csh.in ./init/csh.in
--- ../orig-modules-3.2.10/init/csh.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/csh.in 2012-12-21 09:56:47.805240699 +0100
@@ -9,7 +9,7 @@
@VERSIONING@ setenv MODULE_VERSION "@VERSION@"
@VERSIONING@ setenv MODULE_VERSION_STACK "@VERSION@"
@VERSIONING@endif
-@VERSIONING@set exec_prefix='@BASEPREFIX@/Modules/$MODULE_VERSION'
+@VERSIONING@set exec_prefix='@BASEPREFIX@/share/Modules/$MODULE_VERSION'
@NOTVERSIONING@set exec_prefix='@bindir@'
set prefix=""
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/ksh.in ./init/ksh.in
--- ../orig-modules-3.2.10/init/ksh.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/ksh.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@
@VERSIONING@fi
@VERSIONING@export MODULE_VERSION_STACK
-@VERSIONING@module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd ksh $*`; }
+@VERSIONING@module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd ksh $*`; }
@NOTVERSIONING@module() { eval `@bindir@/modulecmd ksh $*`; }
MODULESHOME=@prefix@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/.modulespath.in ./init/.modulespath.in
--- ../orig-modules-3.2.10/init/.modulespath.in 2012-11-01 23:23:23.000000000 +0100
+++ ./init/.modulespath.in 2012-12-21 09:56:47.805240699 +0100
@@ -14,7 +14,7 @@
# limited by the maximum variable size of your shell.
#
@VERSIONING@@VERSIONPATH@ # location of version files
-@VERSIONING@@BASEPREFIX@/Modules/$MODULE_VERSION/modulefiles # Module pkg modulefiles (if versioning)
-@NOTVERSIONING@@BASEPREFIX@/Modules/modulefiles # Module pkg modulefiles (if no versioning)
+@VERSIONING@@BASEPREFIX@/share/Modules/$MODULE_VERSION/modulefiles # Module pkg modulefiles (if versioning)
+@NOTVERSIONING@@BASEPREFIX@/share/Modules/modulefiles # Module pkg modulefiles (if no versioning)
@MODULEPATH@ # General module files
#@prefix@/your_contribs # Edit for your requirements
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/perl.pm.in ./init/perl.pm.in
--- ../orig-modules-3.2.10/init/perl.pm.in 2012-11-01 17:58:27.000000000 +0100
+++ ./init/perl.pm.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@
sub module {
local ($exec_prefix);
-@VERSIONING@ $exec_prefix = "@BASEPREFIX@/Modules/".$ENV{"MODULE_VERSION"};
+@VERSIONING@ $exec_prefix = "@BASEPREFIX@/share/Modules/".$ENV{"MODULE_VERSION"};
@VERSIONING@ eval `$exec_prefix/bin/modulecmd perl @_`;
@NOTVERSIONING@ $exec_prefix = "@bindir@";
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/python.py.in ./init/python.py.in
--- ../orig-modules-3.2.10/init/python.py.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/python.py.in 2012-12-21 09:56:47.805240699 +0100
@@ -24,7 +24,7 @@
args = args[0]
else:
args = list(args)
-@VERSIONING@ (output, error) = subprocess.Popen(['@BASEPREFIX@/Modules/%s/bin/modulecmd' % os.environ['MODULE_VERSION'], 'python'] +
+@VERSIONING@ (output, error) = subprocess.Popen(['@BASEPREFIX@/share/Modules/%s/bin/modulecmd' % os.environ['MODULE_VERSION'], 'python'] +
@NOTVERSIONING@ (output, error) = subprocess.Popen(['@bindir@/modulecmd', 'python'] +
args, stdout=subprocess.PIPE).communicate()
exec output
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/ruby.rb.in ./init/ruby.rb.in
--- ../orig-modules-3.2.10/init/ruby.rb.in 2012-10-25 21:32:01.000000000 +0200
+++ ./init/ruby.rb.in 2012-12-21 09:56:47.805240699 +0100
@@ -22,7 +22,7 @@
else
args = args.join(" ")
end
-@VERSIONING@ exec_prefix = "@BASEPREFIX@/Modules/#{ENV['MODULE_VERSION']}"
+@VERSIONING@ exec_prefix = "@BASEPREFIX@/share/Modules/#{ENV['MODULE_VERSION']}"
@VERSIONING@ eval `#{exec_prefix}/bin/modulecmd ruby #{args}`
@NOTVERSIONING@ exec_prefix = "@bindir@"
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/sh.in ./init/sh.in
--- ../orig-modules-3.2.10/init/sh.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/sh.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@
@VERSIONING@fi
@VERSIONING@export MODULE_VERSION_STACK
-@VERSIONING@module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd sh $*`; }
+@VERSIONING@module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd sh $*`; }
@NOTVERSIONING@module() { eval `@bindir@/modulecmd sh $*`; }
MODULESHOME=@prefix@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/zsh.in ./init/zsh.in
--- ../orig-modules-3.2.10/init/zsh.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/zsh.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@
@VERSIONING@fi
@VERSIONING@export MODULE_VERSION_STACK
-@VERSIONING@module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd zsh $*`; }
+@VERSIONING@module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd zsh $*`; }
@NOTVERSIONING@module() { eval `@bindir@/modulecmd zsh $*`; }
MODULESHOME=@prefix@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/INSTALL ./INSTALL
--- ../orig-modules-3.2.10/INSTALL 2012-10-25 21:32:01.000000000 +0200
+++ ./INSTALL 2012-12-21 09:56:47.805240699 +0100
@@ -103,7 +103,7 @@
your system root, else it may get wiped out with every OS upgrade.
The default is /usr/local/Modules/modulefiles/. You will use the
--with-module-path=<path> option to the configure script to set this
-directory. The default is $prefix/Modules/modulefiles, where
+directory. The default is $prefix/share/Modules/modulefiles, where
$prefix is set by the the --prefix configure option. (The default
is /usr/local.)
After the initial hardwork of getting the module command
@@ -152,7 +152,7 @@
--prefix=/alternate/usr/local/or/equivalent/1.0/eg
The default for --prefix is /usr/local ($prefix).
-The default for --with-module-path is "$prefix/Modules/modulefiles".
+The default for --with-module-path is "$prefix/share/Modules/modulefiles".
If you have trouble with the configuration, then consider
Run "./configure --help" to view some of the other options.