Allow CFLAGS to be overridden while preserving VERSION

If someone defined their own CFLAGS, they would have to include a -DVERSION=
as well (or else get unknown-version as the version).

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>

diff --git a/Makefile b/Makefile
index 61fc86b246f9615996ec9e4eb78c5520b32f99f1..91cb097ed54f261ff38b4cee8215b245f57b4429 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ endif
 RPM_VERSION = $(subst -,.,$(VERSION))
 
 LDLIBS = -lcurses
 RPM_VERSION = $(subst -,.,$(VERSION))
 
 LDLIBS = -lcurses

-CFLAGS = -Wall -O2 '-DVERSION="$(VERSION)"'
+CFLAGS = -Wall -O2

 DFLAGS = -g -DDEBUG -Werror
 PROGS  = tig
 MANDOC = tig.1 tigrc.5
 DFLAGS = -g -DDEBUG -Werror
 PROGS  = tig
 MANDOC = tig.1 tigrc.5


@@ -28,6 +28,8 @@ HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
 ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
 TARNAME        = tig-$(RPM_VERSION)
 
 ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
 TARNAME        = tig-$(RPM_VERSION)
 

+override CFLAGS += '-DVERSION="$(VERSION)"'
+

 all: $(PROGS)
 all-debug: $(PROGS)
 all-debug: CFLAGS += $(DFLAGS)
 all: $(PROGS)
 all-debug: $(PROGS)
 all-debug: CFLAGS += $(DFLAGS)