Merge pull request #503 from inikep/dev11

Dev11
dev
Yann Collet 2016-12-28 16:50:39 +01:00 committed by GitHub
commit 8d7432914f
2 changed files with 6 additions and 11 deletions

View File

@ -98,12 +98,7 @@ else
INSTALL ?= install INSTALL ?= install
endif endif
ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
PREFIX ?= /usr
else
PREFIX ?= /usr/local PREFIX ?= /usr/local
endif
DESTDIR ?= DESTDIR ?=
LIBDIR ?= $(PREFIX)/lib LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR ?= $(PREFIX)/include INCLUDEDIR ?= $(PREFIX)/include

View File

@ -156,15 +156,15 @@ else
INSTALL ?= install INSTALL ?= install
endif endif
ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
PREFIX ?= /usr
else
PREFIX ?= /usr/local PREFIX ?= /usr/local
endif
DESTDIR ?= DESTDIR ?=
BINDIR ?= $(PREFIX)/bin BINDIR ?= $(PREFIX)/bin
ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
MANDIR ?= $(PREFIX)/man/man1
else
MANDIR ?= $(PREFIX)/share/man/man1 MANDIR ?= $(PREFIX)/share/man/man1
endif
INSTALL_PROGRAM ?= $(INSTALL) -m 755 INSTALL_PROGRAM ?= $(INSTALL) -m 755
INSTALL_SCRIPT ?= $(INSTALL) -m 755 INSTALL_SCRIPT ?= $(INSTALL) -m 755