mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-21 01:04:10 +08:00
[svn-r1855] Use the user MAKE if that has been set.
This commit is contained in:
parent
015079ab20
commit
ac4430b260
@ -26,6 +26,9 @@ HDF4LIB=$HDF4LIB_default
|
||||
# What compression methods to use?
|
||||
METHODS="gzip bzip2"
|
||||
|
||||
# Use User's MAKE if set. Else use generic make.
|
||||
MAKE=${MAKE:-make}
|
||||
|
||||
# Make sure cvs would work
|
||||
if [ -z "$CVSROOT" ]; then
|
||||
echo "Where is the CVS repository?" 1>&2
|
||||
@ -136,7 +139,7 @@ fi # Do CVS checkout
|
||||
if [ "$cmd" = "all" -o -n "$cmdtest" ]; then
|
||||
# Make sure current version exists and is clean
|
||||
if [ -d ${COMPARE}/current ]; then
|
||||
(cd ${COMPARE}/current && make distclean)
|
||||
(cd ${COMPARE}/current && ${MAKE} distclean)
|
||||
else
|
||||
errcode=$?
|
||||
snapshot=no
|
||||
@ -162,7 +165,7 @@ if [ "$cmd" = "all" -o -n "$cmdtest" ]; then
|
||||
if [ "$snapshot" = "yes" ]; then
|
||||
if (cd ${COMPARE}/current; \
|
||||
${CONFIGURE}; \
|
||||
make check); then
|
||||
${MAKE} check); then
|
||||
:
|
||||
else
|
||||
errcode=$?
|
||||
@ -178,7 +181,7 @@ fi # Test the HDF5 library
|
||||
#=============================
|
||||
if [ "$cmd" = "all" -o -n "$cmdrel" ]; then
|
||||
if [ "$snapshot" = "yes" ]; then
|
||||
(cd ${COMPARE}/current; make distclean)
|
||||
(cd ${COMPARE}/current; ${MAKE} distclean)
|
||||
(
|
||||
# Turn on exit on error in the sub-shell so that it does not
|
||||
# cvs commit if errors encounter here.
|
||||
|
Loading…
Reference in New Issue
Block a user