gentoo-overlay/app-misc/hivex/files/1.3.3/0002-automake.patch

From: Hilko Bengen <bengen@debian.org>
Date: Thu, 1 Dec 2011 22:08:07 +0100
Subject: automake

---
 lib/Makefile.in |    6 +++++-
 sh/Makefile.in  |    1 +
 xml/Makefile.in |    6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 65734dd..5cf7bde 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1045,7 +1045,11 @@ libhivex_la_LDFLAGS = \
 	$(LTLIBTHREAD)
 
 libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir)
+libhivex_la_CPPFLAGS = \
+  -I$(top_srcdir)/gnulib/lib \
+  -I$(top_builddir)/gnulib/lib \
+  -I$(srcdir)
+
 include_HEADERS = hivex.h
 man_MANS = hivex.3
 noinst_DATA = \
diff --git a/sh/Makefile.in b/sh/Makefile.in
index 109c8e8..0308a32 100644
--- a/sh/Makefile.in
+++ b/sh/Makefile.in
@@ -995,6 +995,7 @@ hivexsh_SOURCES = \
 hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE)
 hivexsh_CFLAGS = \
   -I$(top_srcdir)/gnulib/lib \
+  -I$(top_builddir)/gnulib/lib \
   -I$(top_srcdir)/lib \
   -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
   $(WARN_CFLAGS) $(WERROR_CFLAGS)
diff --git a/xml/Makefile.in b/xml/Makefile.in
index ed4cd72..5cb647f 100644
--- a/xml/Makefile.in
+++ b/xml/Makefile.in
@@ -119,7 +119,8 @@ PROGRAMS = $(bin_PROGRAMS)
 am_hivexml_OBJECTS = hivexml-hivexml.$(OBJEXT)
 hivexml_OBJECTS = $(am_hivexml_OBJECTS)
 am__DEPENDENCIES_1 =
-hivexml_DEPENDENCIES = ../lib/libhivex.la $(am__DEPENDENCIES_1)
+hivexml_DEPENDENCIES = ../lib/libhivex.la ../gnulib/lib/libgnu.la \
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
@@ -976,10 +977,11 @@ EXTRA_DIST = \
 hivexml_SOURCES = \
   hivexml.c
 
-hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS)
+hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS)
 hivexml_CFLAGS = \
   -DLOCALEBASEDIR=\""$(datadir)/locale"\" \
   -I$(top_srcdir)/gnulib/lib \
+  -I$(top_builddir)/gnulib/lib \
   -I$(top_srcdir)/lib \
   $(LIBXML2_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS)
--