BSD: improved "make install"

This commit is contained in:
Przemyslaw Skibinski 2016-12-23 10:05:49 +01:00
parent b999170311
commit 63b0014b96
2 changed files with 29 additions and 17 deletions

View File

@ -87,20 +87,26 @@ clean:
@$(RM) decompress/*.o @$(RM) decompress/*.o
@echo Cleaning library completed @echo Cleaning library completed
#------------------------------------------------------------------------ #-----------------------------------------------------------------------------
#make install is validated only for Linux, OSX, kFreeBSD, Hurd and some BSD targets # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
#-----------------------------------------------------------------------------
ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS))
ifneq (,$(filter $(shell uname),SunOS)) ifneq (,$(filter $(shell uname),SunOS))
PREFIX ?= /usr
INSTALL ?= ginstall INSTALL ?= ginstall
else else
PREFIX ?= /usr/local
INSTALL ?= install INSTALL ?= install
endif endif
DESTDIR ?=
LIBDIR ?= $(PREFIX)/lib ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
INCLUDEDIR=$(PREFIX)/include PREFIX ?= /usr
else
PREFIX ?= /usr/local
endif
DESTDIR ?=
LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR ?= $(PREFIX)/include
ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly)) ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly))
PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
@ -108,9 +114,10 @@ else
PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
endif endif
INSTALL_LIB ?= $(INSTALL) -m 755 INSTALL_LIB ?= $(INSTALL) -m 755
INSTALL_DATA ?= $(INSTALL) -m 644 INSTALL_DATA ?= $(INSTALL) -m 644
libzstd.pc: libzstd.pc:
libzstd.pc: libzstd.pc.in libzstd.pc: libzstd.pc.in
@echo creating pkgconfig @echo creating pkgconfig

View File

@ -145,25 +145,30 @@ clean_decomp_o:
@$(RM) $(ZSTDDECOMP_O) @$(RM) $(ZSTDDECOMP_O)
#---------------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#make install is validated only for Linux, OSX, kFreeBSD, Hurd and some BSD targets # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
#---------------------------------------------------------------------------------- #-----------------------------------------------------------------------------
ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS))
ifneq (,$(filter $(shell uname),SunOS)) ifneq (,$(filter $(shell uname),SunOS))
PREFIX ?= /usr
INSTALL ?= ginstall INSTALL ?= ginstall
else else
PREFIX ?= /usr/local
INSTALL ?= install INSTALL ?= install
endif endif
ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
PREFIX ?= /usr
else
PREFIX ?= /usr/local
endif
DESTDIR ?= DESTDIR ?=
BINDIR = $(PREFIX)/bin BINDIR ?= $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man/man1 MANDIR ?= $(PREFIX)/share/man/man1
INSTALL_PROGRAM ?= $(INSTALL) -m 755 INSTALL_PROGRAM ?= $(INSTALL) -m 755
INSTALL_SCRIPT ?= $(INSTALL) -m 755 INSTALL_SCRIPT ?= $(INSTALL) -m 755
INSTALL_MAN ?= $(INSTALL) -m 644 INSTALL_MAN ?= $(INSTALL) -m 644
install: zstd install: zstd
@echo Installing binaries @echo Installing binaries