From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 10 May 2022 13:57:17 +0000 (+0200)
Subject: - Fix Python build in non-source directory; based on patch by
X-Git-Tag: release-1.16.0rc1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77149fc2aa403bd7c738ab7ec2d9e54c7ff7c3ef;p=thirdparty%2Funbound.git

- Fix Python build in non-source directory; based on patch by
  Michael Tokarev.
---

diff --git a/Makefile.in b/Makefile.in
index 943887799..7dbe57600 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,7 +57,7 @@ LEX=@LEX@
 STRIP=@STRIP@
 CC=@CC@
 CPPFLAGS=-I. @CPPFLAGS@
-PYTHON_CPPFLAGS=-I. @PYTHON_CPPFLAGS@
+PYTHON_CPPFLAGS=-I. -I$(srcdir) @PYTHON_CPPFLAGS@
 CFLAGS=-DSRCDIR=$(srcdir) @CFLAGS@
 LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
@@ -567,7 +567,7 @@ pythonmod-install:
 
 pyunbound-install:
 	$(INSTALL) -m 755 -d $(DESTDIR)$(PYTHON_SITE_PKG)
-	$(INSTALL) -c -m 644 $(srcdir)/libunbound/python/unbound.py $(DESTDIR)$(PYTHON_SITE_PKG)/unbound.py
+	$(INSTALL) -c -m 644 libunbound/python/unbound.py $(DESTDIR)$(PYTHON_SITE_PKG)/unbound.py
 	$(LIBTOOL) --mode=install cp _unbound.la $(DESTDIR)$(PYTHON_SITE_PKG)
 	$(LIBTOOL) --mode=finish $(DESTDIR)$(PYTHON_SITE_PKG)
 
diff --git a/doc/Changelog b/doc/Changelog
index ca3d9f8cb..9cc1d134a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+10 May 2022: George
+	- Fix Python build in non-source directory; based on patch by
+	  Michael Tokarev.
+
 6 May 2022: Tom
 	- Merge PR #604: Add basic support for EDE (RFC8914).