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@xxxxxxxxxxxxxxxxxx> --- Makefile | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 61fc86b..91cb097 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ endif 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 @@ -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) +override CFLAGS += '-DVERSION="$(VERSION)"' + all: $(PROGS) all-debug: $(PROGS) all-debug: CFLAGS += $(DFLAGS) -- 1.5.2.888.g96a5e - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
