diff mbox series

[2/3] build: avoid recursion into py/ if not selected

Message ID 20190625065835.31188-2-jengelh@inai.de
State Accepted
Delegated to: Pablo Neira
Headers show
Series [1/3] build: unbreak non-functionality of --disable-python | expand

Commit Message

Jan Engelhardt June 25, 2019, 6:58 a.m. UTC 
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 Makefile.am    | 6 ++++--
 py/Makefile.am | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

Comments

Pablo Neira Ayuso June 25, 2019, 8:05 a.m. UTC | #1 
Also applied, thanks.
diff mbox series

Patch

diff --git a/Makefile.am b/Makefile.am
index e567d32..4a17424 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,10 @@  ACLOCAL_AMFLAGS	= -I m4
 SUBDIRS = 	src	\
 		include	\
 		files	\
-		doc		\
-		py
+		doc
+if HAVE_PYTHON
+SUBDIRS += py
+endif
 
 EXTRA_DIST =	tests	\
 		files
diff --git a/py/Makefile.am b/py/Makefile.am
index 9fce7c9..5f4e1f6 100644
--- a/py/Makefile.am
+++ b/py/Makefile.am
@@ -1,7 +1,5 @@ 
 EXTRA_DIST = setup.py __init__.py nftables.py schema.json
 
-if HAVE_PYTHON
-
 all-local:
 	cd $(srcdir) && \
 		$(PYTHON_BIN) setup.py build --build-base $(abs_builddir)
@@ -28,4 +26,3 @@  clean-local:
 
 distclean-local:
 	rm -f version
-endif