summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2001-03-14 22:58:34 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2001-03-14 22:58:34 (GMT)
commit740a52b6227583082dab263b672f46ad516e0029 (patch)
tree43276a65f8b367ea85b5fa22027353e699b318ae
parent376b58d1d7e679330f039a9018eaa2d80545b2d5 (diff)
downloadhdf5-740a52b6227583082dab263b672f46ad516e0029.zip
hdf5-740a52b6227583082dab263b672f46ad516e0029.tar.gz
hdf5-740a52b6227583082dab263b672f46ad516e0029.tar.bz2
[svn-r3637] Purpose:
Bug Fix Description: On the Nersc machines, the install-sh script wasn't being found in the proper place. Solution: Corrected the "fix" I put in there awhile ago. Essentially, if the INSTALL macro is the program "install-sh" with anything around it, then we assume they want our install-sh program and force the Makefiles to find it in the hdf5/bin directory. Platforms tested: Nersc.
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 79525c9..b0fe119 100755
--- a/configure
+++ b/configure
@@ -1688,7 +1688,7 @@ exec 5>>./config.log
case "$INSTALL" in
- ..*install-sh)
+ *install-sh*)
INSTALL='\${top_srcdir}'/bin/install-sh
;;
esac
diff --git a/configure.in b/configure.in
index 1864000..8ec2693 100644
--- a/configure.in
+++ b/configure.in
@@ -238,7 +238,7 @@ AM_PROG_LIBTOOL
dnl Fix up the INSTALL macro if it's a relative path. We want the
dnl full-path to the binary instead.
case "$INSTALL" in
- ..*install-sh)
+ *install-sh*)
INSTALL='\${top_srcdir}'/bin/install-sh
;;
esac