From: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon, 17 Feb 2025 19:46:15 +0000 (+0200)
Subject: Build: Fix out-of-tree builds when using the replacement getopt_long
X-Git-Tag: v5.7.2beta~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eaf242c56e8c65db83d48b018fa44aeafeb33a5;p=thirdparty%2Fxz.git

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 6662ecd5..5cb14a15 100644
--- 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 38d75ced..391d7145 100644
--- 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 f300cc45..c2810479 100644
--- 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