summaryrefslogtreecommitdiffstats
path: root/hl/c++
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/c++
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/c++')
-rw-r--r--hl/c++/examples/Makefile.am1
-rw-r--r--hl/c++/examples/Makefile.in1
-rw-r--r--hl/c++/src/Makefile.in2
3 files changed, 3 insertions, 1 deletions
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am
index c8f0305..7202a96 100644
--- a/hl/c++/examples/Makefile.am
+++ b/hl/c++/examples/Makefile.am
@@ -36,6 +36,7 @@ CXX_API=yes
# Where to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++
+EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
# How to build programs using h5c++
$(EXTRA_PROG): $(H5CPP)
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index e5abead..76570bc 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -625,6 +625,7 @@ CXX_API = yes
# Where to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++
+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/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 49a6c27..6440a63 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -671,7 +671,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
# This is our main target