summaryrefslogtreecommitdiffstats
path: root/hl/c++
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-03-30 21:14:48 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-03-30 21:14:48 (GMT)
commit14e06e81cbf54a16e03efb776391acfc2d22e7eb (patch)
tree1fd44423b9cd97d17a7774799220a93c6bd75513 /hl/c++
parent7ce84a1d39930f96990dd6b9c0403170dfb5c8dc (diff)
downloadhdf5-14e06e81cbf54a16e03efb776391acfc2d22e7eb.zip
hdf5-14e06e81cbf54a16e03efb776391acfc2d22e7eb.tar.gz
hdf5-14e06e81cbf54a16e03efb776391acfc2d22e7eb.tar.bz2
[svn-r10511]
Purpose: "Bug fix" Description: Hardcoded Makefiles to use /bin/sh instead of letting configure detect shell automatically. This is what v1.6 does, and avoids problems on janus. Platforms tested: sleipnir, copper, modi4, mir
Diffstat (limited to 'hl/c++')
-rw-r--r--hl/c++/Makefile.in7
-rw-r--r--hl/c++/src/Makefile.in7
-rw-r--r--hl/c++/test/Makefile.in7
3 files changed, 18 insertions, 3 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index f33f2a0..ce8b45d 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -186,7 +186,12 @@ R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SETX = @SETX@
SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh. Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
SIZE_T = @SIZE_T@
SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 56c9dc5..994e21a 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -208,7 +208,12 @@ R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SETX = @SETX@
SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh. Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
SIZE_T = @SIZE_T@
SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 2717a41..f1a0959 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -202,7 +202,12 @@ R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SETX = @SETX@
SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+
+# Hardcode SHELL to be /bin/sh. Most machines have this shell, and
+# on at least one machine configure fails to detect its existence (janus).
+# Also, when HDF5 is configured on one machine but run on another,
+# configure's automatic SHELL detection may not work on the build machine.
+SHELL = /bin/sh
SIZE_T = @SIZE_T@
SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@