From 89de1d4e186c22dac7cb07c8d00de8c7e75a4dbc Mon Sep 17 00:00:00 2001 From: James Bowes Date: Sat, 2 Jun 2007 13:14:50 -0400 Subject: [PATCH] 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 Signed-off-by: Jonas Fonseca --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- 2.32.0.93.g670b81a890