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 /fortran | |
| 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 'fortran')
| -rw-r--r-- | fortran/Makefile.in | 6 | ||||
| -rw-r--r-- | fortran/examples/Makefile.in | 6 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 6 | ||||
| -rw-r--r-- | fortran/test/Makefile.in | 6 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.in | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/fortran/Makefile.in b/fortran/Makefile.in index cf5740f..b9678f5 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -249,6 +249,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@ @@ -260,9 +262,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 9cec95a..8702ab3 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/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/fortran/src/Makefile.in b/fortran/src/Makefile.in index 05cb0cf..a61d929 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -304,6 +304,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@ @@ -315,9 +317,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/fortran/test/Makefile.in b/fortran/test/Makefile.in index c5c5fb7..185db9b 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -301,6 +301,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@ @@ -312,9 +314,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/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index ea886c8..14f4e7b 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -252,6 +252,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@ @@ -263,9 +265,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@ |