BSD: improved "make install"

diff --git a/lib/Makefile b/lib/Makefile
index ba39977714eb721c0a212b8b7ccc04ae7a276976..cd87e7756a059ed1e97cc5846f011550f418d8ca 100644 (file)
--- 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 34b1be292b7d8dc8bff58888bfd6e0874d5fb3bd..8ec9fc698b1641abb4d7cb95bea0c726c0c1026f 100644 (file)
--- 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