From 6db4160c4f951aed3b56dbce9e94947b65f79d2b Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 26 May 2016 08:14:37 +0200 Subject: python3: use install_glob Signed-off-by: Michael Olbrich --- rules/python3.make | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/rules/python3.make b/rules/python3.make index 8294bbead..1ddbeeafe 100644 --- a/rules/python3.make +++ b/rules/python3.make @@ -132,14 +132,6 @@ PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_LIBTK) += tkinter PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_IDLELIB) += idlelib PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_DISTUTILS) += distutils -ifneq ($(PYTHON3_SKIP-y),) -PYTHON3_SKIP_LIST_PRE :=-o -name $(quote) -PYTHON3_SKIP_LIST_POST :=$(quote) - -PYTHON3_SKIP_LIST := $(subst $(space),$(PYTHON3_SKIP_LIST_POST) $(PYTHON3_SKIP_LIST_PRE),$(PYTHON3_SKIP-y)) -PYTHON3_SKIP_LIST := $(PYTHON3_SKIP_LIST_PRE)$(PYTHON3_SKIP_LIST)$(PYTHON3_SKIP_LIST_POST) -endif - $(STATEDIR)/python3.targetinstall: @$(call targetinfo) @@ -150,14 +142,8 @@ $(STATEDIR)/python3.targetinstall: @$(call install_fixup, python3,AUTHOR,"Han Sierkstra ") @$(call install_fixup, python3,DESCRIPTION,missing) - @cd $(PYTHON3_PKGDIR) && \ - find ./usr/lib/python$(PYTHON3_MAJORMINOR) \ - \( -name test -o -name tests -o -name __pycache__ \ - $(PYTHON3_SKIP_LIST) \) -prune \ - -o -name "*.so" -print -o -name "*.pyc" -print | \ - while read file; do \ - $(call install_copy, python3, 0, 0, 644, -, $${file##.}); \ - done + @$(call install_glob, python3, 0, 0, -, /usr/lib/python$(PYTHON3_MAJORMINOR), \ + *.so *.pyc, */test */tests */__pycache__ $(PYTHON3_SKIP-y)) @$(call install_copy, python3, 0, 0, 755, -, /usr/bin/python$(PYTHON3_MAJORMINOR)) @$(call install_lib, python3, 0, 0, 644, libpython$(PYTHON3_MAJORMINOR)m) -- cgit v1.2.3