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 BF8409254 for ; Mon, 5 Oct 2015 22:20:13 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 05 Oct 2015 13:20:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,640,1437462000"; d="scan'208";a="804228136" Received: from mcarril6-mobl.zpn.intel.com ([10.219.24.17]) by fmsmga001.fm.intel.com with ESMTP; 05 Oct 2015 13:20:12 -0700 From: Mario Carrillo To: dev@dpdk.org Date: Mon, 5 Oct 2015 15:20:04 -0500 Message-Id: <1444076406-30141-6-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 5/7] mk: Add rule for installing documentation 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:14 -0000 Add hierarchy-file support to the DPDK documentation. When invoking "make install-doc" documentation files will be installed in: $(DESTDIR)/$(DOC_DIR) where DOC_DIR=$(DESTDIR)/usr/share/doc/dpdk by default. You can override DOC_DIR var. This hierarchy is based on: http://www.freedesktop.org/software/systemd/man/file-hierarchy.html Signed-off-by: Mario Carrillo --- mk/rte.sdkinstall.mk | 14 ++++++++++++++ mk/rte.sdkroot.mk | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 628d9fb..d917329 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -44,12 +44,14 @@ T=* ifneq (,$(wildcard $(BUILD_DIR)/build/.config)) INCLUDE_DIR ?= /usr/include/dpdk BIN_DIR ?= /usr/bin +DOC_DIR ?= /usr/share/doc/dpdk HSLINKS := $(wildcard $(RTE_OUTPUT)/include/*) BINARY_FILES := $(patsubst %.map,,$(wildcard $(RTE_OUTPUT)/app/*)) NIC_FILES := $(wildcard $(BUILD_DIR)/tools/*.py) BINARY_FILES += $(NIC_FILES) LIBS := $(wildcard $(RTE_OUTPUT)/lib/*) MODULES := $(wildcard $(RTE_OUTPUT)/kmod/*) +DOCS := $(wildcard $(BUILD_DIR)/doc/*) include $(BUILD_DIR)/build/.config RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) @@ -148,6 +150,18 @@ install-mod: echo installing: $$MOD; \ done # +# install documentation in /usr/share/doc/dpdk +# bu default, DOC_DIR can be overriden. +# +.PHONY: install-doc +install-doc: + @echo ================== Installing documentation + @[ -d $(DESTDIR)/$(DOC_DIR) ] || mkdir -p $(DESTDIR)/$(DOC_DIR) + @for DOC in ${DOCS}; do \ + cp -rf $$DOC ${DESTDIR}/${DOC_DIR}; \ + echo installing: $$DOC; \ + done +# # uninstall: remove all built sdk # UNINSTALL_TARGETS := $(addsuffix _uninstall,\ diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index e652218..43f937e 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -97,8 +97,10 @@ test fast_test ring_test mempool_test perf_test coverage: testall: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktestall.mk $@ -.PHONY: install install-headers install-bin install-lib install-mod uninstall -install install-headers install-bin install-lib install-mod uninstall: +.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: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ .PHONY: doc help -- 2.1.0