From 451f0ad9aa5fa3da194d8fb7947503a5b1e2b2d6 Mon Sep 17 00:00:00 2001 From: Kai Krakow Date: Fri, 19 Jan 2018 22:11:34 +0100 Subject: [PATCH] Makefile: Allow installation of fiemap/fiewalk support tools There's now a new make target called "install_tools" which would not run by default on installation. One can add "OPTIONAL_INSTALL_TARGETS=install_tools" into localconf to install these by default. fiewalk would be installed to sbin, as only root can run it, the other goes to bin. Gentoo can use this to optionally install these tools as a package feature. Signed-off-by: Kai Krakow --- Makefile | 7 ++++++- contrib/gentoo/bees-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d151332..51d404e 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,11 @@ README.html: README.md install_libs: lib install -Dm644 lib/libcrucible.so $(DESTDIR)$(USRLIB_PREFIX)/libcrucible.so +install_tools: ## Install support tools + libs +install_tools: install_libs src + install -Dm755 bin/fiemap $(DESTDIR)$(USR_PREFIX)/bin/fiemap + install -Dm755 bin/fiewalk $(DESTDIR)$(USR_PREFIX)/sbin/fiewalk + install_bees: ## Install bees + libs install_bees: install_libs src $(RUN_INSTALL_TESTS) install -Dm755 bin/bees $(DESTDIR)$(LIBEXEC_PREFIX)/bees @@ -60,7 +65,7 @@ install_scripts: scripts install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_LIB_PREFIX)/system/beesd@.service install: ## Install distribution -install: install_bees install_scripts +install: install_bees install_scripts $(OPTIONAL_INSTALL_TARGETS) help: ## Show help @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##/\t/' diff --git a/contrib/gentoo/bees-9999.ebuild b/contrib/gentoo/bees-9999.ebuild index 0742ee8..a03e3d1 100644 --- a/contrib/gentoo/bees-9999.ebuild +++ b/contrib/gentoo/bees-9999.ebuild @@ -22,7 +22,7 @@ PATCHES=" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="" +IUSE="tools" COMMON_DEPEND=" >=sys-apps/util-linux-2.30.2 @@ -41,4 +41,9 @@ HTML_DOCS="README.html" src_prepare() { default echo LIBDIR=$(get_libdir) >>${S}/localconf + localconf=${S}/localconf + if use tools; then + einfo "Building with support tools fiemap and fiewalk." + echo OPTIONAL_INSTALL_TARGETS=install_tools >>${localconf} || die + fi }