diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-01 19:51:57 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-01 19:51:57 (GMT) |
| commit | 1abb6b133b54af0cdfa277b4f12304d3e88331bf (patch) | |
| tree | b9d31d2a4cf59e1ff6b25affb094e308eb864b26 | |
| parent | 9a1a404e5abab4dbff5a96de5983e93e2a419ec6 (diff) | |
| download | hdf5-1abb6b133b54af0cdfa277b4f12304d3e88331bf.zip hdf5-1abb6b133b54af0cdfa277b4f12304d3e88331bf.tar.gz hdf5-1abb6b133b54af0cdfa277b4f12304d3e88331bf.tar.bz2 | |
[svn-r17571] 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 6878261a5..39b7641 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -313,6 +313,10 @@ Bug Fixes since HDF5-1.8.0 release Configuration ------------- + - Added $(EXEEXT) extension to H5detect when it's executed in the + src/Makfile 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 fb73bbf..eb31afb 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -127,7 +127,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 4fc229a..ef006a7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1222,7 +1222,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) |