From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 889018E73 for ; Thu, 3 Dec 2015 22:37:59 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 03 Dec 2015 13:37:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,378,1444719600"; d="scan'208";a="864198876" Received: from mcarril6-mobl.zpn.intel.com ([10.219.16.33]) by orsmga002.jf.intel.com with ESMTP; 03 Dec 2015 13:37:54 -0800 From: Mario Carrillo To: dev@dpdk.org Date: Thu, 3 Dec 2015 15:37:50 -0600 Message-Id: <1449178671-32288-11-git-send-email-mario.alfredo.c.arevalo@intel.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1449178671-32288-1-git-send-email-mario.alfredo.c.arevalo@intel.com> References: <1442608390-12537-1-git-send-email-mario.alfredo.c.arevalo@intel.com> <1449178671-32288-1-git-send-email-mario.alfredo.c.arevalo@intel.com> Cc: jos.c.venegas.munoz@intel.com Subject: [dpdk-dev] [PATCH v9 10/11] mk: Add new install rule 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: Thu, 03 Dec 2015 21:38:00 -0000 If "T" variable is defined, the installation process will have the current behaviour, else install rule will be called. Signed-off-by: Mario Carrillo --- mk/rte.sdkinstall.mk | 12 +++++++++++- mk/rte.sdkroot.mk | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 1ba7bc0..2989528 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -40,7 +40,6 @@ endif # target name or a name containing jokers "*". Example: # x86_64-native-*-gcc ifndef T -T=* ifneq (,$(wildcard $(RTE_OUTPUT)/.config)) prefix ?= /usr/local exec_prefix ?= $(prefix) @@ -198,6 +197,17 @@ install-fhs: install-lib install-bin install-doc install-mod cp -rf $(RTE_SDK)/tools $(DESTDIR)/$(datadir); \ echo installing: $(RTE_SDK)/tools # +# if "T" var is defined, mbuild rule will be called, else +# install-fhs rule will be called. +# +.PHONY: install +install: +ifdef T +install: mbuild +else +install: install-fhs +endif +# # uninstall: remove all built sdk # UNINSTALL_TARGETS := $(addsuffix _uninstall,\ diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 1b619b7..2f8f64a 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -97,9 +97,9 @@ test fast_test ring_test mempool_test perf_test coverage: testall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktestall.mk $@ -.PHONY: mbuild install-headers install-bin install-lib install-mod \ +.PHONY: mbuild install install-headers install-bin install-lib install-mod \ install-doc install-sdk install-fhs uninstall -mbuild install-headers install-bin install-lib install-mod install-doc \ +mbuild install install-headers install-bin install-lib install-mod install-doc \ install-sdk install-fhs uninstall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ -- 2.6.3