diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-03-10 21:01:50 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-03-10 21:01:50 (GMT) |
| commit | 893b8bffeebb62c318c50b76981ff0d1d8cdf20a (patch) | |
| tree | 9b4bff4cd61eb02c6d8dc7067c2a09ad29af87a1 /hl/tools | |
| parent | b4ff3e6e79a46fb474eb1786a11a7d2451455111 (diff) | |
| download | hdf5-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/tools')
| -rw-r--r-- | hl/tools/Makefile.in | 6 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 3801bc9..c336878 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -246,6 +246,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@ @@ -257,9 +259,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/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index c330309..2feb079 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -268,6 +268,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@ @@ -279,9 +281,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@ |