Build: Fix out-of-tree builds when using the replacement getopt_long

Nowaways $(top_builddir)/lib/getopt.h depends on headers in
$(top_srcdir)/lib, so both have to be in the include path.
CMake-based build already did this.

Fixes: 7e884c00d0093c38339f17fb1d280eec493f42ca

diff --git a/src/lzmainfo/Makefile.am b/src/lzmainfo/Makefile.am
index 6662ecd5336b1b5ae5e2fc6893ba61d32d442561..5cb14a156acfc75118b2274212b46359b11751a6 100644 (file)
--- a/src/lzmainfo/Makefile.am
+++ b/src/lzmainfo/Makefile.am
@@ -18,12 +18,14 @@ endif
 lzmainfo_CPPFLAGS = \
        -DLOCALEDIR=\"$(localedir)\" \
        -I$(top_srcdir)/src/common \
-       -I$(top_srcdir)/src/liblzma/api \
-       -I$(top_builddir)/lib
+       -I$(top_srcdir)/src/liblzma/api
 
 lzmainfo_LDADD = $(top_builddir)/src/liblzma/liblzma.la
 
 if COND_GNULIB
+lzmainfo_CPPFLAGS += \
+       -I$(top_builddir)/lib \
+       -I$(top_srcdir)/lib
 lzmainfo_LDADD += $(top_builddir)/lib/libgnu.a
 endif
 

diff --git a/src/xz/Makefile.am b/src/xz/Makefile.am
index 38d75cede50b3729e3a2608f9660e8cbe9fe44bf..391d7145d76de77e6f407a28b98e890079cace99 100644 (file)
--- a/src/xz/Makefile.am
+++ b/src/xz/Makefile.am
@@ -50,12 +50,14 @@ endif
 xz_CPPFLAGS = \
        -DLOCALEDIR=\"$(localedir)\" \
        -I$(top_srcdir)/src/common \
-       -I$(top_srcdir)/src/liblzma/api \
-       -I$(top_builddir)/lib
+       -I$(top_srcdir)/src/liblzma/api
 
 xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la
 
 if COND_GNULIB
+xz_CPPFLAGS += \
+       -I$(top_builddir)/lib \
+       -I$(top_srcdir)/lib
 xz_LDADD += $(top_builddir)/lib/libgnu.a
 endif
 

diff --git a/src/xzdec/Makefile.am b/src/xzdec/Makefile.am
index f300cc45e6588d53c36180ae505a9ba7caef4fb4..c2810479ac28c87b61dda74fde384aea46e48624 100644 (file)
--- a/src/xzdec/Makefile.am
+++ b/src/xzdec/Makefile.am
@@ -21,11 +21,13 @@ endif
 xzdec_CPPFLAGS = \
        -DTUKLIB_GETTEXT=0 \
        -I$(top_srcdir)/src/common \
-       -I$(top_srcdir)/src/liblzma/api \
-       -I$(top_builddir)/lib
+       -I$(top_srcdir)/src/liblzma/api
 xzdec_LDADD = $(top_builddir)/src/liblzma/liblzma.la
 
 if COND_GNULIB
+xzdec_CPPFLAGS += \
+       -I$(top_builddir)/lib \
+       -I$(top_srcdir)/lib
 xzdec_LDADD += $(top_builddir)/lib/libgnu.a
 endif