mk: do not install meson.build in usertools
authorTimothy Redaelli <tredaelli@redhat.com>
Tue, 27 Nov 2018 19:35:32 +0000 (20:35 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Tue, 18 Dec 2018 23:59:13 +0000 (00:59 +0100)
In commit 7dd34c71de2a ("usertools: install with meson") meson.build was
added in usertools directory and so it's copied to $(datadir)/usertools
with "make install".

This patch avoids to copy meson.build when installing usertools with
"make install".

Fixes: 7dd34c71de2a ("usertools: install with meson")
Cc: stable@dpdk.org
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Acked-by: Luca Boccassi <bluca@debian.org>
mk/rte.sdkinstall.mk

index 8296e6d..2d34b4e 100644 (file)
@@ -99,8 +99,9 @@ install-runtime:
                --exclude 'app/cmdline*' --exclude app/test \
                --exclude app/testacl --exclude app/testpipeline app | \
            tar -xf -      -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS)
-       $(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir))
-       $(Q)cp $(CP_FLAGS) $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
+       $(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir)/usertools)
+       $(Q)tar -cf -      -C $(RTE_SDK) --exclude meson.build usertools | \
+           tar -xf -      -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS)
        $(Q)$(call rte_mkdir,      $(DESTDIR)$(sbindir))
        $(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
                                   $(DESTDIR)$(sbindir)/dpdk-devbind)