Commit 07ec3da8 authored by gsell's avatar gsell

changes from master merged

parents 4b056469 1173724d
...@@ -57,7 +57,7 @@ std::get_YN_answer() { ...@@ -57,7 +57,7 @@ std::get_YN_answer() {
# $1: filename # $1: filename
std::get_abspath() { std::get_abspath() {
local -r fname=$1 local -r fname=$1
[[ -r "${fname}" ]] || return 1 #[[ -r "${fname}" ]] || return 1
if [[ -d ${fname} ]]; then if [[ -d ${fname} ]]; then
echo $(cd "${fname}" && pwd) echo $(cd "${fname}" && pwd)
else else
......
...@@ -16,7 +16,7 @@ endif ...@@ -16,7 +16,7 @@ endif
setenv PMODULES_MODULEFILES_DIR 'modulefiles' setenv PMODULES_MODULEFILES_DIR 'modulefiles'
setenv PMODULES_DEFINED_RELEASES ':unstable:stable:deprecated:' setenv PMODULES_DEFINED_RELEASES ':unstable:stable:deprecated:'
setenv PMODULES_ROOT '/opt/psi' setenv PMODULES_ROOT "@PMODULES_ROOT@"
setenv PMODULES_CONFIG_DIR 'config' setenv PMODULES_CONFIG_DIR 'config'
setenv PMODULES_HOME "${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}" setenv PMODULES_HOME "${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
setenv PMODULES_DIR "${PMODULES_HOME}" setenv PMODULES_DIR "${PMODULES_HOME}"
......
#!/usr/bin/env modbuild #!/usr/bin/env modbuild
pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz" pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz"
pbuild::install_docfiles 'license.terms' 'README*' pbuild::install_docfiles 'license.terms' 'README.md'
pbuild::configure() { pbuild::configure() {
case ${OS} in case ${OS} in
......
This diff is collapsed.
#!/bin/bash #!/bin/bash
#
# define PMODULES_ROOT only if it has not been passed as argument
# to build/install scripts
# #
: ${PMODULES_ROOT:=@PMODULES_ROOT@} : ${PMODULES_ROOT:=@PMODULES_ROOT@}
: ${PMODULES_DISTFILESDIR:=@PMODULES_DISTFILESDIR@} : ${PMODULES_DISTFILESDIR:=@PMODULES_DISTFILESDIR@}
: ${PMODULES_TMPDIR:=@PMODULES_TMPDIR@} : ${PMODULES_TMPDIR:=@PMODULES_TMPDIR@}
export PMODULES_ROOT
export PMODULES_DISTFILESDIR
export PMODULES_TMPDIR
declare -x PMODULES_CONFIG_DIR='config' declare -x PMODULES_CONFIG_DIR='config'
declare -x PMODULES_MODULEFILES_DIR='modulefiles' declare -x PMODULES_MODULEFILES_DIR='modulefiles'
...@@ -17,16 +16,3 @@ declare -x PMODULES_DEFAULT_GROUPS='Tools Programming' ...@@ -17,16 +16,3 @@ declare -x PMODULES_DEFAULT_GROUPS='Tools Programming'
declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:' declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:'
declare -x PMODULES_DEFAULT_RELEASES='stable' declare -x PMODULES_DEFAULT_RELEASES='stable'
export PMODULES_DISTFILESDIR
export PMODULES_TMPDIR
#-----------------------------------------------------------------------------
# OS specific configuration
#
case ${OS} in
Darwin )
declare -x MACOSX_DEPLOYMENT_TARGET='10.12'
#declare -rx SDKROOT='macosx10.9'
;;
esac
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment