summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-05-27 22:12:43 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-05-27 22:12:43 (GMT)
commitb1cf507c6d8ff53f4f9e474fa5878360562b3a1d (patch)
tree4fd757508145c9b969c717f2843ec5d6957df071 /hl/fortran
parent244784ab2cf816b135f27bf03b5a4fb91502aed9 (diff)
parentae82b5232a98e170c74118fe3ddab4b525d89fe9 (diff)
downloadhdf5-b1cf507c6d8ff53f4f9e474fa5878360562b3a1d.zip
hdf5-b1cf507c6d8ff53f4f9e474fa5878360562b3a1d.tar.gz
hdf5-b1cf507c6d8ff53f4f9e474fa5878360562b3a1d.tar.bz2
[svn-r27116] svn merge -r26937:27115 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'hl/fortran')
-rw-r--r--hl/fortran/examples/Makefile.am1
-rw-r--r--hl/fortran/examples/Makefile.in1
-rw-r--r--hl/fortran/src/Makefile.in2
3 files changed, 3 insertions, 1 deletions
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am
index 91cb7c5..6a5032b 100644
--- a/hl/fortran/examples/Makefile.am
+++ b/hl/fortran/examples/Makefile.am
@@ -54,6 +54,7 @@ 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
# 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/Makefile.in b/hl/fortran/examples/Makefile.in
index 4150781..feb1864 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -632,6 +632,7 @@ FORTRAN_API = yes
# 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
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index f513337..fb3e161 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -692,7 +692,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
# After making changes, run bin/reconfigure to update other configure related
# files like Makefile.in.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 207
+LT_VERS_REVISION = 210
LT_VERS_AGE = 0
# Our main target, the high-level fortran library