From fdd835023946770d94a29027922df03ac87fb998 Mon Sep 17 00:00:00 2001 From: Kai Krakow Date: Wed, 10 Jan 2018 23:05:43 +0100 Subject: [PATCH] Installation: Improve filesystem layout flexibility In preparation for Gentoo QA checks during ebuild merge phase, let's make some more of the filesystem layout adjustable. Signed-off-by: Kai Krakow --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 899748c..363289c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ PREFIX ?= / -LIBEXEC_PREFIX ?= $(PREFIX)/usr/lib/bees +LIBDIR ?= lib +USR_PREFIX ?= $(PREFIX)/usr +USRLIB_PREFIX ?= $(USR_PREFIX)/$(LIBDIR) +SYSTEMD_LIB_PREFIX ?= $(PREFIX)/lib/systemd +LIBEXEC_PREFIX ?= $(USRLIB_PREFIX)/bees MARKDOWN := $(firstword $(shell which markdown markdown2 markdown_py 2>/dev/null)) MARKDOWN ?= markdown @@ -36,14 +40,14 @@ README.html: README.md install_bees: ## Install bees + libs install_bees: lib src test - install -Dm644 lib/libcrucible.so $(DESTDIR)$(PREFIX)/usr/lib/libcrucible.so + install -Dm644 lib/libcrucible.so $(DESTDIR)$(USRLIB_PREFIX)/libcrucible.so install -Dm755 bin/bees $(DESTDIR)$(LIBEXEC_PREFIX)/bees install_scripts: ## Install scipts install_scripts: scripts - install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/usr/sbin/beesd + install -Dm755 scripts/beesd $(DESTDIR)$(USR_PREFIX)/sbin/beesd install -Dm644 scripts/beesd.conf.sample $(DESTDIR)$(PREFIX)/etc/bees/beesd.conf.sample - install -Dm644 scripts/beesd@.service $(DESTDIR)$(PREFIX)/lib/systemd/system/beesd@.service + install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_LIB_PREFIX)/system/beesd@.service install: ## Install distribution install: install_bees install_scripts