@@ -134,7 +134,7 @@ endif
134134
135135ifneq (,$(filter Windows% ,$(TARGET_SYSTEM ) ) )
136136
137- LIBZSTD = dll/libzstd.dll
137+ LIBZSTD = dll/libzstd- $( LIBVER_MAJOR ) .dll
138138$(LIBZSTD ) : $(ZSTD_FILES )
139139 @echo compiling dynamic library $(LIBVER )
140140 $(CC ) $(FLAGS ) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll/libzstd.dll.a -shared $^ -o $@
@@ -284,6 +284,12 @@ exec_prefix ?= $(PREFIX)
284284EXEC_PREFIX ?= $(exec_prefix )
285285libdir ?= $(EXEC_PREFIX ) /lib
286286LIBDIR ?= $(libdir )
287+ ifeq (,$(filter Windows% ,$(TARGET_SYSTEM ) ) )
288+ shlibdir ?= $(libdir )
289+ else
290+ shlibdir ?= $(EXEC_PREFIX ) /bin
291+ endif
292+ SHLIBDIR ?= $(shlibdir )
287293includedir ?= $(PREFIX ) /include
288294INCLUDEDIR ?= $(includedir )
289295
@@ -360,11 +366,15 @@ install-static:
360366install-shared :
361367 # only generate libzstd.so if it's not already present
362368 [ -e $( LIBZSTD) ] || $(MAKE ) libzstd-release
363- [ -e $( DESTDIR) $( LIBDIR ) ] || $(INSTALL ) -d -m 755 $(DESTDIR )$(LIBDIR ) /
369+ [ -e $( DESTDIR) $( SHLIBDIR ) ] || $(INSTALL ) -d -m 755 $(DESTDIR )$(SHLIBDIR ) /
364370 @echo Installing shared library
365- $(INSTALL_PROGRAM ) $(LIBZSTD ) $(DESTDIR )$(LIBDIR )
366- ln -sf $(LIBZSTD ) $(DESTDIR )$(LIBDIR ) /libzstd.$(SHARED_EXT_MAJOR )
367- ln -sf $(LIBZSTD ) $(DESTDIR )$(LIBDIR ) /libzstd.$(SHARED_EXT )
371+ $(INSTALL_PROGRAM ) $(LIBZSTD ) $(DESTDIR )$(SHLIBDIR )
372+ ifeq (,$(filter Windows% ,$(TARGET_SYSTEM ) ) )
373+ ln -sf $(LIBZSTD) $(DESTDIR)$(SHLIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
374+ ln -sf $(LIBZSTD) $(DESTDIR)$(SHLIBDIR)/libzstd.$(SHARED_EXT)
375+ else
376+ $(INSTALL_PROGRAM) dll/libzstd.dll.a $(DESTDIR)$(LIBDIR)
377+ endif
368378
369379.PHONY : install-includes
370380install-includes :
@@ -377,9 +387,10 @@ install-includes:
377387.PHONY : uninstall
378388uninstall :
379389 $(RM ) $(DESTDIR )$(LIBDIR ) /libzstd.a
380- $(RM ) $(DESTDIR )$(LIBDIR ) /libzstd.$(SHARED_EXT )
381- $(RM ) $(DESTDIR )$(LIBDIR ) /libzstd.$(SHARED_EXT_MAJOR )
382- $(RM ) $(DESTDIR )$(LIBDIR ) /$(LIBZSTD )
390+ $(RM ) $(DESTDIR )$(SHLIBDIR ) /libzstd.$(SHARED_EXT )
391+ $(RM ) $(DESTDIR )$(SHLIBDIR ) /libzstd.$(SHARED_EXT_MAJOR )
392+ $(RM ) $(DESTDIR )$(SHLIBDIR ) /$(LIBZSTD )
393+ $(RM ) $(DESTDIR )$(LIBDIR ) /libzstd.dll.a
383394 $(RM ) $(DESTDIR )$(PKGCONFIGDIR ) /libzstd.pc
384395 $(RM ) $(DESTDIR )$(INCLUDEDIR ) /zstd.h
385396 $(RM ) $(DESTDIR )$(INCLUDEDIR ) /zstd_errors.h
0 commit comments