diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-12-09 18:16:52 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-12-09 18:16:52 (GMT) |
| commit | 49fe497201bcefcd9beb01fe8fc2175974b73799 (patch) | |
| tree | 82ec36c32198122e75c1dfa20e61678b8722f56b /hl/fortran | |
| parent | 62e6349eabb00c69fa69aab0fbe34cdc092d072f (diff) | |
| download | hdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.zip hdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.tar.gz hdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.tar.bz2 | |
Revert "Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_12"
This reverts commit 9f9336a5bd541752f472bab4c93da8de89f862cd, reversing
changes made to 437a1919e7ba60fe75a33a466d264183a0255319.
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 b81cc6f..d383f9a 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=$(examplesdir)/hl/fortran -EXAMPLETOPDIR=$(examplesdir)/hl +EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran +EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/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 d7de8e3..5f12ef0 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 @examplesdir@/hl/fortran using h5fc or h5pfc. The # +# installed in .../share/hdf5_examples/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@" |