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/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 'hl/fortran')
-rw-r--r-- | hl/fortran/Makefile.in | 6 | ||||
-rw-r--r-- | hl/fortran/examples/Makefile.in | 6 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 6 | ||||
-rw-r--r-- | hl/fortran/test/Makefile.in | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 3923b06..af080bb 100644 --- a/hl/fortran/Makefile.in +++ b/hl/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/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 7cc30e4..1de9302 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/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/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 0b269a4..4d4b6fc 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -269,6 +269,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@ @@ -280,9 +282,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/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index e43ab95..6958f34 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -259,6 +259,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@ @@ -270,9 +272,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@ |