minor lib build refactoring

diff --git a/NEWS b/NEWS
index f6f1ad90bffb767c79e249599285fa990d1bd2f8..7f30f2d52008fb70eb7bd3be7c45538fcfc45fa5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,6 @@ cli : new : added zstdless and zstdgrep tools
 cli : fixed : status displays total amount decoded, even for file consisting of multiple frames (like pzstd)
 cli : fixed : zstdcat
 lib : changed : only public ZSTD_ symbols are now exposed
-lib : fixed : soname
 API : changed : zbuff prototypes now generate deprecation warnings
 API : changed : streaming decompression implicit reset on starting new frame
 API : added experimental : dictID retrieval functions

diff --git a/lib/Makefile b/lib/Makefile
index 21a805d05ada437880ec010e6a7571cb0e8a6408..fcc0d099d57ba5dcd7342bb89906dba91166bff7 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -47,7 +47,7 @@ ifeq ($(shell uname), Darwin)
        SHARED_EXT = dylib
        SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
        SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
-       SONAME_FLAGS = -install_name $(PREFIX)/lib/libzstd.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
+       SONAME_FLAGS = -install_name $(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
 else
        SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR)
        SHARED_EXT = so
@@ -107,15 +107,15 @@ libzstd.pc: libzstd.pc.in
 
 install: libzstd.a libzstd libzstd.pc
        @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-       @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+       @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
        @cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
        @cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
        @cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-       @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-       @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-       @install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
-       @install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h   # prototypes generate deprecation warnings
-       @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+       @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)
+       @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)
+       @install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
+       @install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
+       @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
        @echo zstd static and shared library installed
 
 uninstall: