diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-03-10 21:07:50 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-03-10 21:07:50 (GMT) |
| commit | ddf384fb35052913970bcabd7b247f4280be08fc (patch) | |
| tree | 225475504d9744e545f391d16f19c16c2565149e /hl/c++ | |
| parent | 1b0e131cc415a72269cdcb8f93669c7e94412ced (diff) | |
| download | hdf5-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 'hl/c++')
| -rw-r--r-- | hl/c++/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/c++/examples/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 859757a..9ce31d4 100644 --- a/hl/c++/Makefile.in +++ b/hl/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@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 6977f10..fa94108 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -239,6 +239,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@ @@ -250,9 +252,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@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 71c7f85..4e168ad 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -264,6 +264,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@ @@ -275,9 +277,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@ 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@ |