Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev

# Conflicts:
#	programs/Makefile

diff --cc programs/Makefile
index 372d7b0,4d8b391..290361f
--- 1/programs/Makefile
--- 2/programs/Makefile
+++ b/programs/Makefile
@@@ -40,12 -40,9 +40,10 @@@ BINDIR  := $(PREFIX)/bi
  MANDIR  := $(PREFIX)/share/man/man1
  LZ4DIR  := ../lib
  
- DESTDIR ?=
- PREFIX  ?= /usr/local
  CFLAGS  ?= -O3   # can select custom flags. For example : CFLAGS="-O2 -g" make
  CFLAGS  += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes
- CPPFLAGS:= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ -DLZ4_VERSION=\"$(RELEASE)\"
 +CFLAGS  += $(MOREFLAGS)
+ CPPFLAGS:= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_
  FLAGS   := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
  
  

diff --cc programs/lz4cli.c
Simple merge