From: Yann Collet <yann.collet.73@gmail.com>
Date: Thu, 31 Dec 2015 17:32:15 +0000 (+0100)
Subject: update version to 0.4.6
X-Git-Tag: v0.4.6~2^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=722504c2a07a72d2b3ce6784fff46bc795bd97a9;p=thirdparty%2Fzstd.git

update version to 0.4.6
---

diff --git a/Makefile b/Makefile
index 9caa907cb..62ca6683d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,8 @@
 #  - Public forum : https://groups.google.com/forum/#!forum/lz4c
 # ################################################################
 
+# force a version number : uncomment below export (otherwise, default to the one declared into zstd.h)
+#export VERSION := 0.4.6
 
 PRGDIR  = programs
 ZSTDDIR = lib
diff --git a/lib/Makefile b/lib/Makefile
index 181d4a735..a4a156d85 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -40,7 +40,7 @@ LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT))
 LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT))
 LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT))
 LIBVER := $(shell echo $(LIBVER_SCRIPT))
-VERSION:= $(LIBVER)
+VERSION?= $(LIBVER)
 
 DESTDIR?=
 PREFIX ?= /usr/local
diff --git a/lib/zstd.h b/lib/zstd.h
index d6eb0b517..bba096144 100644
--- a/lib/zstd.h
+++ b/lib/zstd.h
@@ -62,7 +62,7 @@ extern "C" {
 ***************************************/
 #define ZSTD_VERSION_MAJOR    0    /* for breaking interface changes  */
 #define ZSTD_VERSION_MINOR    4    /* for new (non-breaking) interface capabilities */
-#define ZSTD_VERSION_RELEASE  5    /* for tweaks, bug-fixes, or development */
+#define ZSTD_VERSION_RELEASE  6    /* for tweaks, bug-fixes, or development */
 #define ZSTD_VERSION_NUMBER  (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE)
 ZSTDLIB_API unsigned ZSTD_versionNumber (void);
 
diff --git a/programs/Makefile b/programs/Makefile
index b9d51adc8..f2230d973 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -39,7 +39,7 @@ LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT))
 LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT))
 LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT))
 LIBVER := $(shell echo $(LIBVER_SCRIPT))
-VERSION:= $(LIBVER)
+VERSION?= $(LIBVER)
 
 DESTDIR?=
 PREFIX ?= /usr/local