From 63b0014b96a3a71c68fdc4b05c0b894d936587f3 Mon Sep 17 00:00:00 2001
From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Fri, 23 Dec 2016 10:05:49 +0100
Subject: [PATCH] BSD: improved "make install"

---
 lib/Makefile      | 23 +++++++++++++++--------
 programs/Makefile | 23 ++++++++++++++---------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index ba3997771..cd87e7756 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -87,20 +87,26 @@ clean:
 	@$(RM) decompress/*.o
 	@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),SunOS))
-PREFIX ?= /usr
 INSTALL ?= ginstall
 else
-PREFIX ?= /usr/local
 INSTALL ?= install
 endif
-DESTDIR ?=
-LIBDIR ?= $(PREFIX)/lib
-INCLUDEDIR=$(PREFIX)/include
+
+ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
+PREFIX  ?= /usr
+else
+PREFIX  ?= /usr/local
+endif
+
+DESTDIR    ?=
+LIBDIR     ?= $(PREFIX)/lib
+INCLUDEDIR ?= $(PREFIX)/include
 
 ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly))
 PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
@@ -108,9 +114,10 @@ else
 PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
 endif
 
-INSTALL_LIB ?= $(INSTALL) -m 755
+INSTALL_LIB  ?= $(INSTALL) -m 755
 INSTALL_DATA ?= $(INSTALL) -m 644
 
+
 libzstd.pc:
 libzstd.pc: libzstd.pc.in
 	@echo creating pkgconfig
diff --git a/programs/Makefile b/programs/Makefile
index 34b1be292..8ec9fc698 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -145,25 +145,30 @@ clean_decomp_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),SunOS))
-PREFIX ?= /usr
 INSTALL ?= ginstall
 else
-PREFIX ?= /usr/local
 INSTALL ?= install
 endif
+
+ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
+PREFIX  ?= /usr
+else
+PREFIX  ?= /usr/local
+endif
+
 DESTDIR ?=
-BINDIR  = $(PREFIX)/bin
-MANDIR  = $(PREFIX)/share/man/man1
+BINDIR  ?= $(PREFIX)/bin
+MANDIR  ?= $(PREFIX)/share/man/man1
 
 INSTALL_PROGRAM ?= $(INSTALL) -m 755
-INSTALL_SCRIPT ?= $(INSTALL) -m 755
-INSTALL_MAN ?= $(INSTALL) -m 644
+INSTALL_SCRIPT  ?= $(INSTALL) -m 755
+INSTALL_MAN     ?= $(INSTALL) -m 644
 
 install: zstd
 	@echo Installing binaries
-- 
2.47.2