summaryrefslogtreecommitdiffstats
path: root/c++/Makefile.in
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-03-10 21:07:50 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-03-10 21:07:50 (GMT)
commitddf384fb35052913970bcabd7b247f4280be08fc (patch)
tree225475504d9744e545f391d16f19c16c2565149e /c++/Makefile.in
parent1b0e131cc415a72269cdcb8f93669c7e94412ced (diff)
downloadhdf5-ddf384fb35052913970bcabd7b247f4280be08fc.zip
hdf5-ddf384fb35052913970bcabd7b247f4280be08fc.tar.gz
hdf5-ddf384fb35052913970bcabd7b247f4280be08fc.tar.bz2
[svn-r16562] Purpose:
Bug Fix Description: Fixing BZ #1381. The --includedir=DIR configure option, which is used to spceify installation location of C header files, did not work correctly as the path was hard-coded into 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 which allows for customization of this value. Tested: jam, liberty
Diffstat (limited to 'c++/Makefile.in')
-rw-r--r--c++/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 710f178..8796ca7 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -245,6 +245,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@
@@ -256,9 +258,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@