summaryrefslogtreecommitdiffstats
path: root/hl/c++/test
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-03-10 21:01:50 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-03-10 21:01:50 (GMT)
commit893b8bffeebb62c318c50b76981ff0d1d8cdf20a (patch)
tree9b4bff4cd61eb02c6d8dc7067c2a09ad29af87a1 /hl/c++/test
parentb4ff3e6e79a46fb474eb1786a11a7d2451455111 (diff)
downloadhdf5-893b8bffeebb62c318c50b76981ff0d1d8cdf20a.zip
hdf5-893b8bffeebb62c318c50b76981ff0d1d8cdf20a.tar.gz
hdf5-893b8bffeebb62c318c50b76981ff0d1d8cdf20a.tar.bz2
[svn-r16561] Purpose:
Bug Fix Description: Fixing BZ #1381. The --includedir=DIR configure option, which is used to specify the installation location of C header files, did not work correctly as the path was hard-coded in config/commence.am. I'm presuming this is because an older version of automake didn't know where to put c header files. In any case, removing this line now defaults the includedir to the same directory that it is currently hard-coded to, and also fixes the configure flag to allow customization of this value. Tested: jam, liberty
Diffstat (limited to 'hl/c++/test')
-rw-r--r--hl/c++/test/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index d1c689e..285d2e0 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -255,6 +255,8 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+
+# Install directories that automake doesn't know about
docdir = $(exec_prefix)/doc
dvidir = @dvidir@
enable_shared = @enable_shared@
@@ -266,9 +268,7 @@ host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
-
-# Install directories that automake doesn't know about
-includedir = $(exec_prefix)/include
+includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@