Use install-pkgincludeHEADERS for elfutils configure build step.

4 files changed, 21 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 72fca2ed..f4f6ed6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,7 @@ SNAPSHOT
 *.o
 git_version.h
 Makefile
+build-elfutils
+include-elfutils
+lib-elfutils
+stamp-elfutils
diff --git a/ChangeLog b/ChangeLog
index d04a08ee..8fa82c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-01-23  Mark Wielaard  <mjw@redhat.com>
 
+	* configure.ac: Use install-pkgincludeHEADERS for elfutils to only
+	get include-elfutils/elfutils/version.h. And explicitly exit if
+	configuring elfutils fails.
+	* configure: Regenerated.
+	* .gitignore: Add build-elfutils, include-elfutils, lib-elfutils
+	and stamp-elfutils.
+
+2009-01-23  Mark Wielaard  <mjw@redhat.com>
+
 	* configure.ac: Use make -k install-data for elfutils.
 	* configure: Regenerated.
 
diff --git a/configure b/configure
index 6a4aff50..aec13d6e 100755
--- a/configure
+++ b/configure
@@ -7613,11 +7613,11 @@ $as_echo "$as_me: running ${elfutils_srcdir}/configure" >&6;}
 				--prefix="$prefix" \
 				CFLAGS="${CFLAGS/-Wall/}" \
 				LDFLAGS="$LDFLAGS $elfutils_rpath" &&
-   make -k install-data # so that elfutils/version.h - if any - may be found.
-   # Note, we need -k because parts (like to po files) might fail,
-   # since those fo to $prefix to which we might not be able to write.
-   # We are only really interested in the include-elfutils files anyway here.
+   make install-pkgincludeHEADERS
+   # so that elfutils/version.h - if any - may be found.
+   # Don't use install-data because that will fail (installing in $prefix).
   )
+  if test $? != 0; then exit; fi
   save_CPPFLAGS=${CPPFLAGS}
   CPPFLAGS="${CPPFLAGS} -Iinclude-elfutils" # in case bundled elfutils
 
diff --git a/configure.ac b/configure.ac
index 3e0efc95..862a1566 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,11 +312,11 @@ if test $build_elfutils = yes; then
 				--prefix="$prefix" \
 				CFLAGS="${CFLAGS/-Wall/}" \
 				LDFLAGS="$LDFLAGS $elfutils_rpath" &&
-   make -k install-data # so that elfutils/version.h - if any - may be found.
-   # Note, we need -k because parts (like to po files) might fail,
-   # since those fo to $prefix to which we might not be able to write.
-   # We are only really interested in the include-elfutils files anyway here.
+   make install-pkgincludeHEADERS
+   # so that elfutils/version.h - if any - may be found.
+   # Don't use install-data because that will fail (installing in $prefix).
   )
+  if test $? != 0; then exit; fi
   save_CPPFLAGS=${CPPFLAGS}
   CPPFLAGS="${CPPFLAGS} -Iinclude-elfutils" # in case bundled elfutils
   AC_CHECK_HEADERS([elfutils/version.h])