update version to 0.4.6

diff --git a/Makefile b/Makefile
index 9caa907cb3ef33341b34140b310cfad3f5da57f3..62ca6683dd91ea974f745b7a45f18b3067cca58c 100644 (file)
--- 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 181d4a735dd7ba3151298f48dcd6441c99e67c17..a4a156d85e7d7267ef5aa9a167289c796db42f1e 100644 (file)
--- 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 d6eb0b517bbf5c424c52b7870455b5c0ecc5a81f..bba096144d56f1839f035b5462a4c393b789869b 100644 (file)
--- 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 b9d51adc84bbdc5053c9b4ad8639954f292b087c..f2230d973ab73a1e162efd32abb341c05430a458 100644 (file)
--- 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