diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-01 19:52:37 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-01 19:52:37 (GMT) |
| commit | dbb2eadcaa87a69c5c77e78c8db73df89821ca49 (patch) | |
| tree | f3f6357a438b9cc010816226bfac7484c3621801 | |
| parent | 11f088a44c03fc1a49b95ef2adc5654932df597b (diff) | |
| download | hdf5-dbb2eadcaa87a69c5c77e78c8db73df89821ca49.zip hdf5-dbb2eadcaa87a69c5c77e78c8db73df89821ca49.tar.gz hdf5-dbb2eadcaa87a69c5c77e78c8db73df89821ca49.tar.bz2 | |
[svn-r17572] Purpose:
Makefile Bug Fix
Description:
Added $(EXEEXT) extension to H5detect when it's executed to generate
H5Tinit.c so it works correctly on platforms that require the full
extension when running executables.
Tested:
h5committest, mingw, and user-verified (via submitted patch).
| -rw-r--r-- | release_docs/RELEASE.txt | 4 | ||||
| -rwxr-xr-x | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 45cdc24..4856cc3 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -104,6 +104,10 @@ Bug Fixes since HDF5-1.8.3 Configuration ------------- + - Added $(EXEEXT) extension to H5detect when it's executed in the + src/Makefile to generate H5Tinit.c so it works correctly on platforms + that require the full extension when running executables. + MAM - 2009/10/01 - BZ #1613 - Configure will now set FC and CXX to "no" when fortran and c++ are not being compiled, respectively, so configure will not run some of the compiler tests for these languages when they are not diff --git a/src/Makefile.am b/src/Makefile.am index 511c847..d7d0e15 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -123,7 +123,7 @@ settings_DATA=libhdf5.settings H5Tinit.c: H5detect$(EXEEXT) LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ sed -e 's/-L/:/g' -e 's/ //g'`" \ - $(RUNSERIAL) ./H5detect > H5Tinit.c || \ + $(RUNSERIAL) ./H5detect$(EXEEXT) > H5Tinit.c || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ ($(RM) $@ ; exit 1) diff --git a/src/Makefile.in b/src/Makefile.in index 91ffd5a..9d088fb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1194,7 +1194,7 @@ help: H5Tinit.c: H5detect$(EXEEXT) LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ sed -e 's/-L/:/g' -e 's/ //g'`" \ - $(RUNSERIAL) ./H5detect > H5Tinit.c || \ + $(RUNSERIAL) ./H5detect$(EXEEXT) > H5Tinit.c || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ ($(RM) $@ ; exit 1) |