From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id A01608E56 for ; Tue, 1 Dec 2015 01:53:10 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 30 Nov 2015 16:53:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,366,1444719600"; d="scan'208";a="610300672" Received: from mcarril6-mobl.zpn.intel.com ([10.219.16.33]) by FMSMGA003.fm.intel.com with ESMTP; 30 Nov 2015 16:53:08 -0800 From: Mario Carrillo To: dev@dpdk.org Date: Mon, 30 Nov 2015 18:53:20 -0600 Message-Id: <1448931205-17357-7-git-send-email-mario.alfredo.c.arevalo@intel.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1448931205-17357-1-git-send-email-mario.alfredo.c.arevalo@intel.com> References: <1442608390-12537-1-git-send-email-mario.alfredo.c.arevalo@intel.com> <1448931205-17357-1-git-send-email-mario.alfredo.c.arevalo@intel.com> Cc: jos.c.venegas.munoz@intel.com Subject: [dpdk-dev] [PATCH v7 06/11] mk: Add rule for installing sdk files X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2015 00:53:11 -0000 Add hierarchy-file support to the DPDK makefiles, scripts, examples, tools, config files and headers, when invoking "make install-sdk" makefiles, scripts, examples and config files will be installed in: $(DESTDIR)/$(sdkdir) and headers will be installed in: $(DESTDIR)/$(includedir) where sdkdir=$(datadir) datadir=$(datarootdir)/dpdk datarootdir=$(prefix)/share includedir=$(prefix)/include/dpdk prefix=/usr/local by default, you can override "prefix", "sdkdir", "datadir", "datarootdir" and "includedir" vars. This hierarchy is based on: http://www.freedesktop.org/software/systemd/man/file-hierarchy.html and variables are based on: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html https://www.gnu.org/prep/standards/html_node/DESTDIR.html Signed-off-by: Mario Carrillo --- mk/rte.sdkinstall.mk | 19 +++++++++++++++++++ mk/rte.sdkroot.mk | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index c062489..09950fa 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -49,6 +49,8 @@ bindir ?= $(exec_prefix)/bin libdir ?= $(exec_prefix)/lib datarootdir ?= $(prefix)/share docdir ?= $(datarootdir)/doc/dpdk +datadir ?= $(datarootdir)/dpdk +sdkdir ?= $(datadir) HSLINKS := $(shell find $(RTE_OUTPUT)/include/ -name *.h) BINARY_FILES := $(patsubst %.map,,$(wildcard $(RTE_OUTPUT)/app/*)) NIC_FILES := $(wildcard $(RTE_SDK)/tools/*.py) @@ -170,6 +172,23 @@ install-doc: done \ fi # +# install sdk files in /usr/local/share/dpdk by default +# where prefix and "sdkdir", "datadir" and "prefix" var can be overridden. +# +.PHONY: install-sdk +install-sdk: install-headers + @echo ================== Installing sdk files + @[ -d $(DESTDIR)/$(sdkdir) ] || mkdir -p $(DESTDIR)/$(sdkdir); \ + cp -rf $(RTE_SDK)/mk $(DESTDIR)/$(sdkdir); \ + echo installing: $(RTE_SDK)/mk; \ + cp -rf $(RTE_SDK)/scripts $(DESTDIR)/$(sdkdir); \ + echo installing: $(RTE_SDK)/scripts; \ + cp -rf $(RTE_SDK)/examples $(DESTDIR)/$(sdkdir); \ + echo installing: $(RTE_SDK)/examples; + @[ -d $(DESTDIR)/$(sdkdir)/config ] || mkdir -p $(DESTDIR)/$(sdkdir)/config; \ + cp -f $(RTE_SDK)/build/.config $(DESTDIR)/$(sdkdir)/config; \ + echo installing: $(RTE_OUTPUT)/.config +# # uninstall: remove all built sdk # UNINSTALL_TARGETS := $(addsuffix _uninstall,\ diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index f56341d..6fac88a 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -98,8 +98,9 @@ testall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktestall.mk $@ .PHONY: install install-headers install-bin install-lib install-mod \ -install-doc uninstall -install install-headers install-bin install-lib install-mod install-doc uninstall: +install-doc install-sdk uninstall +install install-headers install-bin install-lib install-mod install-doc \ +install-sdk uninstall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ .PHONY: doc help -- 2.6.3