From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Fri, 4 Nov 2016 09:10:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/facebook/dev' into dev11
X-Git-Tag: v1.1.2~88^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38b590ad695a46f2656da45413a03c9018f2b736;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'refs/remotes/facebook/dev' into dev11

# Conflicts:
#	lib/Makefile
---

38b590ad695a46f2656da45413a03c9018f2b736
diff --cc lib/Makefile
index cfc3028eb,a7df44f2f..a928c60c0
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -73,11 -73,9 +73,11 @@@ $(LIBZSTD): LDFLAGS += -shared -fPI
  $(LIBZSTD): $(ZSTD_FILES)
  	@echo compiling dynamic library $(LIBVER)
  	@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 +ifeq (,$(filter Windows%,$(OS)))
  	@echo creating versioned links
- 	@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT_MAJOR)
- 	@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT)
+ 	@ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT_MAJOR)
+ 	@ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT)
 +endif
  
  libzstd : $(LIBZSTD)