diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-14 17:47:19 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-14 17:47:19 (GMT) |
| commit | 7e5d8f294f79ea9df0c9ca9b1ac206f360e10e3d (patch) | |
| tree | fcef73116df6c01e9b937aa677f29326e09973ab /hl/fortran/examples/Makefile.am | |
| parent | 32fcd8f7721ae218a86bf2438f1868c85a2c2fe9 (diff) | |
| parent | 95453166e60ab6ddc3ee8b8719e1868afa589cbf (diff) | |
| download | hdf5-7e5d8f294f79ea9df0c9ca9b1ac206f360e10e3d.zip hdf5-7e5d8f294f79ea9df0c9ca9b1ac206f360e10e3d.tar.gz hdf5-7e5d8f294f79ea9df0c9ca9b1ac206f360e10e3d.tar.bz2 | |
Merge pull request #2482 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit '95453166e60ab6ddc3ee8b8719e1868afa589cbf':
Fix shadow variable
TRILAB-192 version of std=f2008 special check
TRILAB-192 correct fortran commands
Fix shadowed type
TRILAB-192 - cleanup edits and match CMake CXX to autotools
Add missing " and update function calls incorrectly named load_gcc_arguments. Commit changes to gnu-cxxflags to remove unmatched " and to gnu-fflags to not add C warnings flags to H5_FCFLAGS.
TRILAB-192 update LTparse files
Remove 128bit config check fo 1.8
Add missing m4 file
TRILAB-192 - merge changes from develop
Update release note for CMake warnings
Correct extra flags and merge TRILAB-24
Update LT files
Fix orphaned token
Restore page eject chars
Restore page ejects.
Autotools reconfigure update
TRILAB-192 merging warnings changes from develop
Diffstat (limited to 'hl/fortran/examples/Makefile.am')
| -rw-r--r-- | hl/fortran/examples/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index 71c2866..a174094 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -51,8 +51,8 @@ endif # Tell automake how to install examples # Note: no '/' after DESTDIR. Explanation in commence.am -EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran -EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl +EXAMPLEDIR=$(examplesdir)/hl/fortran +EXAMPLETOPDIR=$(examplesdir)/hl # List dependencies for each example. Normally, automake would take # care of this for us, but if we tell automake about the programs it |