From 16ebdbcb57ed1041a655aa16e19c9c3b1eaf95ad Mon Sep 17 00:00:00 2001 From: Andrew Jorgensen Date: Mon, 28 Sep 2015 12:27:48 -0700 Subject: [PATCH] Makefile fixes for packagers (DESTDIR / PREFIX) Adds DESTDIR and PREFIX in appropriate places Adds share/ to the man path Lets the packager override PREFIX --- Documentation/Makefile | 11 +++++++---- Makefile | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index f1bee45e..aa5683cc 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -90,6 +90,9 @@ else # "make -w" NO_SUBDIR = : endif +DESTDIR = +PREFIX := /usr/local + all: man html html: $(DOC_HTML) @@ -98,14 +101,14 @@ man: man1 man1: $(DOC_MAN1) install-no-build: - $(INSTALL) -d -m 755 /usr/local/man/man1 - $(INSTALL) -m 644 $(DOC_MAN1) /usr/local/man/man1 + $(INSTALL) -d -m 755 $(DESTDIR)$(PREFIX)/share/man/man1 + $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(PREFIX)/share/man/man1 install: install-man install-man: man - $(INSTALL) -d -m 755 /usr/local/man/man1 - $(INSTALL) -m 644 $(DOC_MAN1) /usr/local/man/man1 + $(INSTALL) -d -m 755 $(DESTDIR)$(PREFIX)/share/man/man1 + $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(PREFIX)/share/man/man1 docdep_prereqs = \ cmd-list.made $(cmds_txt) diff --git a/Makefile b/Makefile index cdda167c..e5eb69c9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NVME = nvme INSTALL ?= install SRC = ./src DESTDIR = -PREFIX = /usr/local +PREFIX := /usr/local SBINDIR = $(PREFIX)/sbin LIBUDEV:=$(shell ld -ludev > /dev/null 2>&1 ; echo $$?) ifeq ($(LIBUDEV),0) -- 2.50.1