kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Stefan Gehn 2014-04-18 09:29:57 +02:00
parent eb0ded8d55
commit da95bca5c5
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/Makefile
View File

@ -3,10 +3,8 @@ PKG_CONFIG ?= pkg-config
BINMODE ?= 755 BINMODE ?= 755
BINEXT ?= BINEXT ?=
PREFIX ?= /usr/local
INSTALLROOT ?= $(DESTDIR)$(PREFIX) INSTALLROOT ?= $(DESTDIR)$(PREFIX)
ifeq ($(INSTALLROOT),)
INSTALLROOT = /usr/local
endif
SINSTALLDIR ?= $(INSTALLROOT)/bin SINSTALLDIR ?= $(INSTALLROOT)/bin
INSTALLDIRMODE ?= 755 INSTALLDIRMODE ?= 755

4
src/Makefile
View File

@ -3,10 +3,8 @@ PKG_CONFIG ?= pkg-config
BINMODE ?= 755 BINMODE ?= 755
BINEXT ?= BINEXT ?=
PREFIX ?= /usr/local
INSTALLROOT ?= $(DESTDIR)$(PREFIX) INSTALLROOT ?= $(DESTDIR)$(PREFIX)
ifeq ($(INSTALLROOT),)
INSTALLROOT = /usr/local
endif
INSTALLDIR ?= $(INSTALLROOT)/bin INSTALLDIR ?= $(INSTALLROOT)/bin
INSTALLDIRMODE ?= 755 INSTALLDIRMODE ?= 755