summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-03-10 21:01:50 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-03-10 21:01:50 (GMT)
commit893b8bffeebb62c318c50b76981ff0d1d8cdf20a (patch)
tree9b4bff4cd61eb02c6d8dc7067c2a09ad29af87a1 /hl
parentb4ff3e6e79a46fb474eb1786a11a7d2451455111 (diff)
downloadhdf5-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')
-rwxr-xr-xhl/Makefile.in6
-rw-r--r--hl/c++/Makefile.in6
-rw-r--r--hl/c++/examples/Makefile.in6
-rw-r--r--hl/c++/src/Makefile.in6
-rw-r--r--hl/c++/test/Makefile.in6
-rw-r--r--hl/examples/Makefile.in6
-rw-r--r--hl/fortran/Makefile.in6
-rw-r--r--hl/fortran/examples/Makefile.in6
-rw-r--r--hl/fortran/src/Makefile.in6
-rw-r--r--hl/fortran/test/Makefile.in6
-rw-r--r--hl/src/Makefile.in6
-rw-r--r--hl/test/Makefile.in6
-rw-r--r--hl/tools/Makefile.in6
-rw-r--r--hl/tools/gif2h5/Makefile.in6
14 files changed, 42 insertions, 42 deletions
diff --git a/hl/Makefile.in b/hl/Makefile.in
index d642c83..16a4a64 100755
--- a/hl/Makefile.in
+++ b/hl/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/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@
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 714d8da..3c90dd8 100644
--- a/hl/examples/Makefile.in
+++ b/hl/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/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@
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 85a2cbf..bb5fd25 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -265,6 +265,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@
@@ -276,9 +278,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/test/Makefile.in b/hl/test/Makefile.in
index 7f01027..efe8a96 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -275,6 +275,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@
@@ -286,9 +288,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/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@