From da95bca5c5be6055ca3ee27a36120553baf9be9d Mon Sep 17 00:00:00 2001 From: Stefan Gehn Date: Fri, 18 Apr 2014 09:29:57 +0200 Subject: [PATCH] Simplify setting default installation prefix Just setting a default value for PREFIX should have the same result as an explicit check for an empty INSTALLROOT variable. --- server/Makefile | 4 +--- src/Makefile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/Makefile b/server/Makefile index d1d4385..d857c13 100644 --- a/server/Makefile +++ b/server/Makefile @@ -3,10 +3,8 @@ PKG_CONFIG ?= pkg-config BINMODE ?= 755 BINEXT ?= +PREFIX ?= /usr/local INSTALLROOT ?= $(DESTDIR)$(PREFIX) -ifeq ($(INSTALLROOT),) - INSTALLROOT = /usr/local -endif SINSTALLDIR ?= $(INSTALLROOT)/bin INSTALLDIRMODE ?= 755 diff --git a/src/Makefile b/src/Makefile index 08deabd..e622a1b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,10 +3,8 @@ PKG_CONFIG ?= pkg-config BINMODE ?= 755 BINEXT ?= +PREFIX ?= /usr/local INSTALLROOT ?= $(DESTDIR)$(PREFIX) -ifeq ($(INSTALLROOT),) - INSTALLROOT = /usr/local -endif INSTALLDIR ?= $(INSTALLROOT)/bin INSTALLDIRMODE ?= 755