diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-03-31 12:38:25 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2020-03-31 12:38:25 (GMT) |
commit | d9d6e19d6faa2fb60df8c8e011b4d0d66201de5c (patch) | |
tree | 85240d9da990b85cf0bc15ba2bc63f1b4a79d9ea /hl/fortran | |
parent | 9cc69ae1f308336e0e522c989d4cee9f72090815 (diff) | |
download | hdf5-d9d6e19d6faa2fb60df8c8e011b4d0d66201de5c.zip hdf5-d9d6e19d6faa2fb60df8c8e011b4d0d66201de5c.tar.gz hdf5-d9d6e19d6faa2fb60df8c8e011b4d0d66201de5c.tar.bz2 |
TRILAB-192 merging warnings changes from develop
Diffstat (limited to 'hl/fortran')
-rw-r--r-- | hl/fortran/examples/Makefile.am | 4 | ||||
-rw-r--r-- | hl/fortran/examples/run-hlfortran-ex.sh.in | 4 |
2 files changed, 4 insertions, 4 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 diff --git a/hl/fortran/examples/run-hlfortran-ex.sh.in b/hl/fortran/examples/run-hlfortran-ex.sh.in index 8e8663d..d7de8e3 100644 --- a/hl/fortran/examples/run-hlfortran-ex.sh.in +++ b/hl/fortran/examples/run-hlfortran-ex.sh.in @@ -18,7 +18,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # This script will compile and run the fortran examples from source files # -# installed in .../share/hdf5_examples/hl/fortran using h5fc or h5pfc. The # +# installed in @examplesdir@/hl/fortran using h5fc or h5pfc. The # # order for running programs with RunTest in the MAIN section below is taken # # from the Makefile. The order is important since some of the test programs # # use data files created by earlier test programs. Any future additions should # @@ -32,7 +32,7 @@ EXIT_FAILURE=1 # Where the tool is installed. # default is relative path to installed location of the tools -prefix="${prefix:-../../../../}" +prefix="${prefix:-@prefix@}" PARALLEL=@PARALLEL@ # Am I in parallel mode? AR="@AR@" RANLIB="@RANLIB@" |