From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id 3CF018E74 for ; Thu, 3 Dec 2015 14:47:01 +0100 (CET) Received: by wmuu63 with SMTP id u63so21790077wmu.0 for ; Thu, 03 Dec 2015 05:47:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o6+ApiaVN09IIu9CeLM7pMjcOFqaS7EqXJyt4JQuXC0=; b=16PzTGdFT3L61RImQRtscNPOZSLZxnJBRNRxE1RUDzbjEiQCX6jXQgVZrzlatGv2qr dtczTT5RM3wPGFA5YgHDUacnhDkXLDKl7bSLT+K0k44CqY4cs8Ga4AIUrFGirwnrRT4R /74yipXZmZpGwmnbEgsAj5YPj9xtdI1MIJ5++DHQKGOKQW+6rlBeSOYt0ZK3Zzh72AaM YHhsawzyiM4YgQqTTe8PqiD/rsNB0F00T2XJBaHCpqAv4sVhkCqRTUiCuOghW+/C2NmC 9c1veaRsTeZBYHcDx+9PnoIXxOq8cHaSg9NIhsSBfDhPSczlsU/kE2H7oT5UNt1zz94c hHqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o6+ApiaVN09IIu9CeLM7pMjcOFqaS7EqXJyt4JQuXC0=; b=MI+rCcqb0YlYAfYtxkdPw8bZSGQn4EEZ54cr4jTY+UVLBi3Gj3wpQQLUoi2rcQIhOz eZKN4tJrHtSn3Qz2AqLwNjEdlxsgT5IKyJlljt6syTm5PnXgSykdxsAZNOB1dcWgYc1X 81r4mnrwhGz7w4SvLAMWCHkBh5dFD7zIM38IkFn78WAbhInf/SMgpu3M40kjJMMORI+e 1LMfQrlHMUXh2oqmtSuAz/3Oq9rpp3i4CcrM0QhK9fjkqRPtqH0nHnUSqJbKXZYx3V+j QxAADZ7qXmxr2KkgrF5iAb2WA0aFsdu4YdKih/lGu5zUCsVfdUT4/l6UYvjvwgoKKvTM zdZg== X-Gm-Message-State: ALoCoQl2g9SIKOuNlTN1zTvCF8DIjKd9204QgZwnrQ4Vhy3O8OFQuMOWesVVaoJkJQlnp7Fg3OUT X-Received: by 10.28.4.212 with SMTP id 203mr53040176wme.89.1449150421077; Thu, 03 Dec 2015 05:47:01 -0800 (PST) Received: from XPS13.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id k133sm8063912wmg.18.2015.12.03.05.46.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Dec 2015 05:47:00 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Thu, 3 Dec 2015 14:45:30 +0100 Message-Id: <1449150340-21984-4-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1449150340-21984-1-git-send-email-thomas.monjalon@6wind.com> References: <1449118929-19962-1-git-send-email-thomas.monjalon@6wind.com> <1449150340-21984-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v3 03/13] mk: move installation procedure in 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 13:47:01 -0000 The real installation was called "binary install" and was done after the build when DESTDIR was specified. Remove this limitation and move the code in install rule only. Signed-off-by: Thomas Monjalon Acked-by: Panu Matilainen --- mk/rte.sdkbuild.mk | 16 ---------------- mk/rte.sdkinstall.mk | 21 ++++++++++++++++++--- mk/rte.sdkroot.mk | 1 + 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk index 38ec7bd..85f603c 100644 --- a/mk/rte.sdkbuild.mk +++ b/mk/rte.sdkbuild.mk @@ -29,8 +29,6 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# If DESTDIR variable is given, install binary dpdk - # # include rte.vars.mk if config file exists # @@ -61,20 +59,6 @@ CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-)) .PHONY: build build: $(ROOTDIRS-y) @echo "Build complete [$(RTE_TARGET)]" -ifneq ($(DESTDIR),) - $(Q)mkdir -p $(DESTDIR) - $(Q)tar -C $(RTE_SDK) -cf - mk scripts/*.sh | tar -C $(DESTDIR) -x \ - --keep-newer-files --warning=no-ignore-newer -f - - $(Q)mkdir -p $(DESTDIR)/`basename $(RTE_OUTPUT)` - $(Q)tar -C $(RTE_OUTPUT) -chf - \ - --exclude app --exclude hostapp --exclude build \ - --exclude Makefile --exclude .depdirs . | \ - tar -C $(DESTDIR)/`basename $(RTE_OUTPUT)` -x --keep-newer-files \ - --warning=no-ignore-newer -f - - $(Q)install -D $(RTE_OUTPUT)/app/testpmd \ - $(DESTDIR)/`basename $(RTE_OUTPUT)`/app/testpmd - @echo Installation in $(DESTDIR) complete -endif .PHONY: clean clean: $(CLEANDIRS) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 0b80104..c5d0881 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -36,9 +36,8 @@ O ?= . RTE_OUTPUT := $O/$T -.PHONY: install -install: - @echo ================== Installing $T +.PHONY: pre_install +pre_install: $(Q)if [ ! -f $(RTE_OUTPUT)/.config ]; then \ $(MAKE) config O=$(RTE_OUTPUT); \ elif cmp -s $(RTE_OUTPUT)/.config.orig $(RTE_OUTPUT)/.config; then \ @@ -55,3 +54,19 @@ install: echo "Using local configuration"; \ fi $(Q)$(MAKE) all O=$(RTE_OUTPUT) + +.PHONY: install +install: + @echo ================== Installing $(DESTDIR) + $(Q)mkdir -p $(DESTDIR) + $(Q)tar -C $(RTE_SDK) -cf - mk scripts/*.sh | tar -C $(DESTDIR) -x \ + --keep-newer-files --warning=no-ignore-newer -f - + $(Q)mkdir -p $(DESTDIR)/$T + $(Q)tar -C $(RTE_OUTPUT) -chf - \ + --exclude app --exclude hostapp --exclude build \ + --exclude Makefile --exclude .depdirs . | \ + tar -C $(DESTDIR)/$T -x --keep-newer-files \ + --warning=no-ignore-newer -f - + $(Q)install -D $(RTE_OUTPUT)/app/testpmd \ + $(DESTDIR)/$T/app/testpmd + @echo Installation in $(DESTDIR) complete diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 9fdecf4..533afe9 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -95,6 +95,7 @@ test fast_test ring_test mempool_test perf_test coverage: .PHONY: install install: + $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ .PHONY: doc help -- 2.5.2