mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-12 04:14:06 +00:00
Use ${var=default} rather than ${var:-$default}, since according
scripts/*.sh:
Use ${var=default} rather than ${var:-$default}, since according
to the GNU autoconf manual, the latter is not portable.
This commit is contained in:
@@ -12,9 +12,9 @@
|
|||||||
# Environment variables: MERCURY_INT_DIR, MERCURY_DEP_DIR, MERCURY_C_INCL_DIR,
|
# Environment variables: MERCURY_INT_DIR, MERCURY_DEP_DIR, MERCURY_C_INCL_DIR,
|
||||||
# MERCURY_COMPILER.
|
# MERCURY_COMPILER.
|
||||||
|
|
||||||
INTDIR=${MERCURY_INT_DIR:-@LIBDIR@/ints}
|
INTDIR=${MERCURY_INT_DIR=@LIBDIR@/ints}
|
||||||
DEPDIR=${MERCURY_DEP_DIR:-@LIBDIR@/deps}
|
DEPDIR=${MERCURY_DEP_DIR=@LIBDIR@/deps}
|
||||||
C_INCL=${MERCURY_C_INCL_DIR:-@LIBDIR@/inc}
|
C_INCL=${MERCURY_C_INCL_DIR=@LIBDIR@/inc}
|
||||||
MC=${MERCURY_COMPILER:-"@LIBDIR@/bin/@FULLARCH@/mercury_compile"}
|
MC=${MERCURY_COMPILER="@LIBDIR@/bin/@FULLARCH@/mercury_compile"}
|
||||||
|
|
||||||
exec $MC -- -I "$INTDIR" -I "$DEPDIR" --c-include-directory "$C_INCL" "$@"
|
exec $MC -- -I "$INTDIR" -I "$DEPDIR" --c-include-directory "$C_INCL" "$@"
|
||||||
|
|||||||
@@ -12,9 +12,9 @@
|
|||||||
# Environment variables: MERCURY_INT_DIR, MERCURY_DEP_DIR, MERCURY_C_INCL_DIR,
|
# Environment variables: MERCURY_INT_DIR, MERCURY_DEP_DIR, MERCURY_C_INCL_DIR,
|
||||||
# MERCURY_COMPILER.
|
# MERCURY_COMPILER.
|
||||||
|
|
||||||
INTDIR=${MERCURY_INT_DIR:-@LIBDIR@/ints}
|
INTDIR=${MERCURY_INT_DIR=@LIBDIR@/ints}
|
||||||
DEPDIR=${MERCURY_DEP_DIR:-@LIBDIR@/deps}
|
DEPDIR=${MERCURY_DEP_DIR=@LIBDIR@/deps}
|
||||||
C_INCL=${MERCURY_C_INCL_DIR:-@LIBDIR@/inc}
|
C_INCL=${MERCURY_C_INCL_DIR=@LIBDIR@/inc}
|
||||||
MC=${MERCURY_COMPILER:-@LIBDIR@/nuprolog/@FULLARCH@/mercury_compile.nu}
|
MC=${MERCURY_COMPILER=@LIBDIR@/nuprolog/@FULLARCH@/mercury_compile.nu}
|
||||||
|
|
||||||
exec $MC -I "$INTDIR" -I "$DEPDIR" --c-include-directory "$C_INCL" "$@"
|
exec $MC -I "$INTDIR" -I "$DEPDIR" --c-include-directory "$C_INCL" "$@"
|
||||||
|
|||||||
@@ -12,9 +12,9 @@
|
|||||||
# Environment variables: MERCURY_INT_DIR, MERCURY_DEP_DIR, MERCURY_C_INCL_DIR,
|
# Environment variables: MERCURY_INT_DIR, MERCURY_DEP_DIR, MERCURY_C_INCL_DIR,
|
||||||
# MERCURY_COMPILER_SICSTUS.
|
# MERCURY_COMPILER_SICSTUS.
|
||||||
|
|
||||||
INTDIR=${MERCURY_INT_DIR:-@LIBDIR@/ints}
|
INTDIR=${MERCURY_INT_DIR=@LIBDIR@/ints}
|
||||||
DEPDIR=${MERCURY_DEP_DIR:-@LIBDIR@/deps}
|
DEPDIR=${MERCURY_DEP_DIR=@LIBDIR@/deps}
|
||||||
C_INCL=${MERCURY_C_INCL_DIR:-@LIBDIR@/inc}
|
C_INCL=${MERCURY_C_INCL_DIR=@LIBDIR@/inc}
|
||||||
MCS=${MERCURY_COMPILER_SICSTUS:-@LIBDIR@/sicstus/@FULLARCH@/mercury_compile.sicstus}
|
MCS=${MERCURY_COMPILER_SICSTUS=@LIBDIR@/sicstus/@FULLARCH@/mercury_compile.sicstus}
|
||||||
|
|
||||||
exec $MCS -I "$INTDIR" -I "$DEPDIR" --c-include-directory "$C_INCL" "$@"
|
exec $MCS -I "$INTDIR" -I "$DEPDIR" --c-include-directory "$C_INCL" "$@"
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
# -Wenum-clash is for C++ only
|
# -Wenum-clash is for C++ only
|
||||||
# -Wunused causes various spurious warnings
|
# -Wunused causes various spurious warnings
|
||||||
|
|
||||||
C_INCL_DIR=${MERCURY_C_INCL_DIR:-@LIBDIR@/inc}
|
C_INCL_DIR=${MERCURY_C_INCL_DIR=@LIBDIR@/inc}
|
||||||
|
|
||||||
CHECK_OPTS="-ansi
|
CHECK_OPTS="-ansi
|
||||||
-Wall -Wwrite-strings -Wpointer-arith -Wcast-qual -Wtraditional -Wshadow
|
-Wall -Wwrite-strings -Wpointer-arith -Wcast-qual -Wtraditional -Wshadow
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
#
|
#
|
||||||
# Usage: mint module-name ...
|
# Usage: mint module-name ...
|
||||||
|
|
||||||
INTDIR=${MERCURY_INT_DIR:-@LIBDIR@/ints}
|
INTDIR=${MERCURY_INT_DIR=@LIBDIR@/ints}
|
||||||
|
|
||||||
exit_status=0
|
exit_status=0
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@ for arg in "$@"; do
|
|||||||
module="`basename $arg .nl`"
|
module="`basename $arg .nl`"
|
||||||
file="$INTDIR/$module.int"
|
file="$INTDIR/$module.int"
|
||||||
if [ -r "$file" ]; then
|
if [ -r "$file" ]; then
|
||||||
${PAGER:-more} "$file"
|
${PAGER=more} "$file"
|
||||||
else
|
else
|
||||||
echo "`basename $0`: no interface file for \`$module'." 1>&2
|
echo "`basename $0`: no interface file for \`$module'." 1>&2
|
||||||
exit_status=1
|
exit_status=1
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
#
|
#
|
||||||
# Environment variables: MERCURY_C_LIB_DIR
|
# Environment variables: MERCURY_C_LIB_DIR
|
||||||
|
|
||||||
LIBDIR=${MERCURY_C_LIB_DIR:-@LIBDIR@/lib}
|
LIBDIR=${MERCURY_C_LIB_DIR=@LIBDIR@/lib}
|
||||||
verbose=false
|
verbose=false
|
||||||
GRADE=asm_fast.gc
|
GRADE=asm_fast.gc
|
||||||
|
|
||||||
@@ -81,7 +81,7 @@ case "`hostname`" in
|
|||||||
kryten.cs.mu.OZ.AU)
|
kryten.cs.mu.OZ.AU)
|
||||||
GCC=/usr/local/bin/gcc ;;
|
GCC=/usr/local/bin/gcc ;;
|
||||||
*)
|
*)
|
||||||
GCC=${GCC:-gcc}
|
GCC=${GCC=gcc}
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if $verbose; then
|
if $verbose; then
|
||||||
|
|||||||
@@ -11,10 +11,10 @@
|
|||||||
#
|
#
|
||||||
#-----------------------------------------------------------------------------#
|
#-----------------------------------------------------------------------------#
|
||||||
|
|
||||||
MAKE=${MMAKE_MAKE:-make}
|
MAKE=${MMAKE_MAKE=make}
|
||||||
MMAKE_VARS=${MMAKE_VARS:-@LIBDIR@/mmake/Mmake.vars}
|
MMAKE_VARS=${MMAKE_VARS=@LIBDIR@/mmake/Mmake.vars}
|
||||||
MMAKE_RULES=${MMAKE_RULES:-@LIBDIR@/mmake/Mmake.rules}
|
MMAKE_RULES=${MMAKE_RULES=@LIBDIR@/mmake/Mmake.rules}
|
||||||
MERCURY_INT_DIR=${MERCURY_INT_DIR:-@LIBDIR@/ints}
|
MERCURY_INT_DIR=${MERCURY_INT_DIR=@LIBDIR@/ints}
|
||||||
|
|
||||||
MMAKE=$0
|
MMAKE=$0
|
||||||
verbose=false
|
verbose=false
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
#
|
#
|
||||||
# Environment variables: MERCURY_NC_BUILTIN
|
# Environment variables: MERCURY_NC_BUILTIN
|
||||||
|
|
||||||
nc_builtin_nl=${MERCURY_NC_BUILTIN:-@LIBDIR@/nuprolog/nc_builtin.nl}
|
nc_builtin_nl=${MERCURY_NC_BUILTIN=@LIBDIR@/nuprolog/nc_builtin.nl}
|
||||||
|
|
||||||
options=
|
options=
|
||||||
|
|
||||||
@@ -58,5 +58,5 @@ for file in "$@"; do
|
|||||||
fi
|
fi
|
||||||
nc -c $options $tmp.nl
|
nc -c $options $tmp.nl
|
||||||
rm $tmp.nl $tmp.ns
|
rm $tmp.nl $tmp.ns
|
||||||
mv $tmp.no ${target:-"$rootname.no"}
|
mv $tmp.no ${target="$rootname.no"}
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -14,8 +14,8 @@
|
|||||||
#
|
#
|
||||||
# Environment variables: MERCURY_LIB_DIR, MERCURY_LIB_OBJS
|
# Environment variables: MERCURY_LIB_DIR, MERCURY_LIB_OBJS
|
||||||
|
|
||||||
NULIBDIR=${MERCURY_LIB_DIR:-@LIBDIR@/nuprolog/@FULLARCH@}
|
NULIBDIR=${MERCURY_LIB_DIR=@LIBDIR@/nuprolog/@FULLARCH@}
|
||||||
LIBRARY_OBJS=${MERCURY_LIB_OBJS:-`cd $NULIBDIR; echo *.no`}
|
LIBRARY_OBJS=${MERCURY_LIB_OBJS=`cd $NULIBDIR; echo *.no`}
|
||||||
|
|
||||||
options=
|
options=
|
||||||
verbose=false
|
verbose=false
|
||||||
|
|||||||
@@ -13,6 +13,6 @@
|
|||||||
#
|
#
|
||||||
# Environment variables: MERCURY_INTERPRETER
|
# Environment variables: MERCURY_INTERPRETER
|
||||||
|
|
||||||
INTERPRETER=${MERCURY_INTERPRETER:-@LIBDIR@/nuprolog/@FULLARCH@/library.nu}
|
INTERPRETER=${MERCURY_INTERPRETER=@LIBDIR@/nuprolog/@FULLARCH@/library.nu}
|
||||||
|
|
||||||
exec $INTERPRETER "$@"
|
exec $INTERPRETER "$@"
|
||||||
|
|||||||
@@ -13,8 +13,8 @@
|
|||||||
#
|
#
|
||||||
# Environment variables: MERCURY_MOD_LIB_DIR, MERCURY_MOD_LIB_MODS.
|
# Environment variables: MERCURY_MOD_LIB_DIR, MERCURY_MOD_LIB_MODS.
|
||||||
|
|
||||||
MERCURY_MOD_LIB_DIR=${MERCURY_MOD_LIB_DIR:-@LIBDIR@/modules}
|
MERCURY_MOD_LIB_DIR=${MERCURY_MOD_LIB_DIR=@LIBDIR@/modules}
|
||||||
MERCURY_MOD_LIB_MODS=${MERCURY_MOD_LIB_MODS:-@LIBDIR@/modules/*}
|
MERCURY_MOD_LIB_MODS=${MERCURY_MOD_LIB_MODS=@LIBDIR@/modules/*}
|
||||||
|
|
||||||
# maximum number of calls to put in a single function
|
# maximum number of calls to put in a single function
|
||||||
calls_per_func=50
|
calls_per_func=50
|
||||||
|
|||||||
@@ -11,9 +11,9 @@
|
|||||||
#
|
#
|
||||||
# Use `msc -h' for help.
|
# Use `msc -h' for help.
|
||||||
|
|
||||||
sp_builtin_pl=${MERCURY_SP_BUILTIN:-@LIBDIR@/sicstus/sp_builtin.pl}
|
sp_builtin_pl=${MERCURY_SP_BUILTIN=@LIBDIR@/sicstus/sp_builtin.pl}
|
||||||
sicstus_compile=\
|
sicstus_compile=\
|
||||||
${MERCURY_SICSTUS_COMPILER:-@LIBDIR@/sicstus/@FULLARCH@/sicstus_compile}
|
${MERCURY_SICSTUS_COMPILER=@LIBDIR@/sicstus/@FULLARCH@/sicstus_compile}
|
||||||
|
|
||||||
help=false
|
help=false
|
||||||
compile_mode=fastcode
|
compile_mode=fastcode
|
||||||
@@ -101,5 +101,5 @@ for file in "$@"; do
|
|||||||
/\\v/s///g
|
/\\v/s///g
|
||||||
' $file > $tmp.pl
|
' $file > $tmp.pl
|
||||||
$sicstus_compile $compile_mode $tmp.pl
|
$sicstus_compile $compile_mode $tmp.pl
|
||||||
rm $tmp.pl
|
rm $tmp.pl
|
||||||
mv $tmp.ql ${target="$rootname.ql"}
|
mv $tmp.ql ${target="$rootname.ql"}
|
||||||
|
|||||||
@@ -18,9 +18,9 @@
|
|||||||
# -o, --output
|
# -o, --output
|
||||||
# Environment variables: MERCURY_SP_LIB_DIR, MERCURY_SP_LIB_OBJS
|
# Environment variables: MERCURY_SP_LIB_DIR, MERCURY_SP_LIB_OBJS
|
||||||
|
|
||||||
SP=${MERCURY_SICSTUS_PROLOG:-@LIBDIR@/sicstus/@FULLARCH@/library.sicstus.debug}
|
SP=${MERCURY_SICSTUS_PROLOG=@LIBDIR@/sicstus/@FULLARCH@/library.sicstus.debug}
|
||||||
SPLIBDIR=${MERCURY_SP_LIB_DIR:-@LIBDIR@/sicstus/@FULLARCH@}
|
SPLIBDIR=${MERCURY_SP_LIB_DIR=@LIBDIR@/sicstus/@FULLARCH@}
|
||||||
LIBRARY_OBJS=${MERCURY_SP_LIB_OBJS:-`cd $SPLIBDIR; echo *.ql`}
|
LIBRARY_OBJS=${MERCURY_SP_LIB_OBJS=`cd $SPLIBDIR; echo *.ql`}
|
||||||
|
|
||||||
verbose=false
|
verbose=false
|
||||||
debug=false
|
debug=false
|
||||||
|
|||||||
@@ -14,6 +14,6 @@
|
|||||||
# Environment variables: MERCURY_SICSTUS_INTERPRETER
|
# Environment variables: MERCURY_SICSTUS_INTERPRETER
|
||||||
|
|
||||||
INTERPRETER=\
|
INTERPRETER=\
|
||||||
${MERCURY_SICSTUS_INTERPRETER:-@LIBDIR@/sicstus/@FULLARCH@/library.sicstus}
|
${MERCURY_SICSTUS_INTERPRETER=@LIBDIR@/sicstus/@FULLARCH@/library.sicstus}
|
||||||
|
|
||||||
exec $INTERPRETER "$@"
|
exec $INTERPRETER "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user