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 D81718DED for ; Tue, 10 Nov 2015 18:07:24 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 10 Nov 2015 09:07:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,271,1444719600"; d="scan'208";a="682292423" Received: from mcarril6-mobl.amr.corp.intel.com (HELO mcarril6-mobl.zpn.intel.com) ([10.219.16.162]) by orsmga003.jf.intel.com with ESMTP; 10 Nov 2015 09:07:22 -0800 From: Mario Carrillo To: dev@dpdk.org Date: Tue, 10 Nov 2015 11:07:35 -0600 Message-Id: <1447175260-26162-6-git-send-email-mario.alfredo.c.arevalo@intel.com> X-Mailer: git-send-email 2.6.1.120.g24a00ef In-Reply-To: <1447175260-26162-1-git-send-email-mario.alfredo.c.arevalo@intel.com> References: <1442608390-12537-1-git-send-email-mario.alfredo.c.arevalo@intel.com> <1447175260-26162-1-git-send-email-mario.alfredo.c.arevalo@intel.com> Cc: jos.c.venegas.munoz@intel.com Subject: [dpdk-dev] [PATCH v6 05/10] 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: Tue, 10 Nov 2015 17:07:25 -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=$(RTE_PREFIX)/share/doc/dpdk and RTE_PREFIX=/usr/local by default, you can override RTE_PREFIX and DOC_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 | 16 ++++++++++++++++ mk/rte.sdkroot.mk | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 2ba8a52..be7b88e 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -46,10 +46,12 @@ RTE_PREFIX ?= /usr/local INCLUDE_DIR ?= $(RTE_PREFIX)/include/dpdk BIN_DIR ?= $(RTE_PREFIX)/bin LIB_DIR ?= $(RTE_PREFIX)/lib +DOC_DIR ?= $(RTE_PREFIX)/share/doc/dpdk HSLINKS := $(shell find $(RTE_OUTPUT)/include/ -name *.h) BINARY_FILES := $(patsubst %.map,,$(wildcard $(RTE_OUTPUT)/app/*)) NIC_FILES := $(wildcard $(RTE_SDK)/tools/*.py) LIBS := $(wildcard $(RTE_OUTPUT)/lib/*) +DOCS := $(wildcard $(RTE_SDK)/doc/*) MODULES := $(wildcard $(RTE_OUTPUT)/kmod/*) BINARY_FILES += $(NIC_FILES) include $(RTE_OUTPUT)/.config @@ -153,6 +155,20 @@ install-mod: done \ fi # +# install documentation in /usr/local/share/doc/dpdk +# by default, DOC_DIR can be overriden. +# +.PHONY: install-doc +install-doc: + @echo ================== Installing documentation + @if [ ! -z "${DOCS}" ]; then \ + [ -d $(DESTDIR)/$(DOC_DIR) ] || mkdir -p $(DESTDIR)/$(DOC_DIR); \ + for DOC in ${DOCS}; do \ + cp -rf $$DOC ${DESTDIR}/${DOC_DIR}; \ + echo installing: $$DOC; \ + done \ + fi +# # uninstall: remove all built sdk # UNINSTALL_TARGETS := $(addsuffix _uninstall,\ diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index e652218..f56341d 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -97,8 +97,9 @@ 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.6.1.120.g24a00ef