From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 2206D9267 for ; Mon, 5 Oct 2015 22:20:14 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 05 Oct 2015 13:20:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,640,1437462000"; d="scan'208";a="804228161" Received: from mcarril6-mobl.zpn.intel.com ([10.219.24.17]) by fmsmga001.fm.intel.com with ESMTP; 05 Oct 2015 13:20:13 -0700 From: Mario Carrillo To: dev@dpdk.org Date: Mon, 5 Oct 2015 15:20:05 -0500 Message-Id: <1444076406-30141-7-git-send-email-mario.alfredo.c.arevalo@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1444076406-30141-1-git-send-email-mario.alfredo.c.arevalo@intel.com> References: <1442608390-12537-1-git-send-email-mario.alfredo.c.arevalo@intel.com> <1444076406-30141-1-git-send-email-mario.alfredo.c.arevalo@intel.com> Subject: [dpdk-dev] [PATCH v4 6/7] 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: Mon, 05 Oct 2015 20:20:15 -0000 Add hierarchy-file support to the DPDK makefiles, scripts, examples, tools, config files and headers. When invoking "make install-sdk" makefiles, scripts, examples, tools, config files will be installed in: $(DESTDIR)/$(SDK_DIR) and headers will be installed in: $(DESTDIR)/$(INCLUDE_DIR) Where SDK_DIR=/usr/share/dpdk and INCLUDE_DIR=/usr/include/dpdk by default. You can overrite SDK_DIR and INCLUDE_DIR vars. This hierarchy is based on: http://www.freedesktop.org/software/systemd/man/file-hierarchy.html Signed-off-by: Mario Carrillo --- mk/rte.sdkinstall.mk | 20 ++++++++++++++++++++ mk/rte.sdkroot.mk | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index d917329..3675c5a 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -45,6 +45,7 @@ ifneq (,$(wildcard $(BUILD_DIR)/build/.config)) INCLUDE_DIR ?= /usr/include/dpdk BIN_DIR ?= /usr/bin DOC_DIR ?= /usr/share/doc/dpdk +DATA_DIR ?= /usr/share/dpdk HSLINKS := $(wildcard $(RTE_OUTPUT)/include/*) BINARY_FILES := $(patsubst %.map,,$(wildcard $(RTE_OUTPUT)/app/*)) NIC_FILES := $(wildcard $(BUILD_DIR)/tools/*.py) @@ -162,6 +163,25 @@ install-doc: echo installing: $$DOC; \ done # +# install sdk files in /usr/share/dpdk by default +# DATA_DIR can be overridden. +# +.PHONY: install-sdk +install-sdk: install-headers + @echo ================== Installing sdk files + @[ -d $(DESTDIR)/$(DATA_DIR) ] || mkdir -p $(DESTDIR)/$(DATA_DIR); \ + cp -rf $(BUILD_DIR)/mk $(DESTDIR)/$(DATA_DIR); \ + echo installing: $(BUILD_DIR)/mk; \ + cp -rf $(BUILD_DIR)/scripts $(DESTDIR)/$(DATA_DIR); \ + echo installing: $(BUILD_DIR)/scripts; \ + cp -rf $(BUILD_DIR)/examples $(DESTDIR)/$(DATA_DIR); \ + echo installing: $(BUILD_DIR)/examples; \ + cp -rf $(BUILD_DIR)/tools $(DESTDIR)/$(DATA_DIR); \ + echo installing: $(BUILD_DIR)/scripts + @[ -d $(DESTDIR)/$(DATA_DIR)/config ] || mkdir -p $(DESTDIR)/$(DATA_DIR)/config; \ + cp -f $(BUILD_DIR)/build/.config $(DESTDIR)/$(DATA_DIR)/config; \ + echo installing: $(BUILD_DIR)/build/.config +# # uninstall: remove all built sdk # UNINSTALL_TARGETS := $(addsuffix _uninstall,\ diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 43f937e..6fac88a 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -98,9 +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-doc install-sdk uninstall install install-headers install-bin install-lib install-mod install-doc \ -uninstall: +install-sdk uninstall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ .PHONY: doc help -- 2.1.0