From 48510fb56a3ef5ae74f72ee56913ea6295248bb2 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 21 Jan 2009 17:45:19 +0000
Subject: [PATCH] Dont overload DEBUG, use FDEBUG.

---
 GNUmakefile |  6 +++---
 Makefile    | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index a313fc9a..65520f75 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.65 2009-01-20 22:17:53 nicm Exp $
+# $Id: GNUmakefile,v 1.66 2009-01-21 17:45:19 nicm Exp $
 
 .PHONY: clean
 
@@ -7,7 +7,7 @@ VERSION= 0.7
 
 DATE= $(shell date +%Y%m%d-%H%M)
 
-DEBUG= 1
+FDEBUG= 1
 
 META?= \002
 
@@ -47,7 +47,7 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \
 CC?= gcc
 INCDIRS+= -I. -I-
 CFLAGS+= -DBUILD="\"$(VERSION) ($(DATE))\"" -DMETA="'${META}'"
-ifdef DEBUG
+ifdef FDEBUG
 CFLAGS+= -g -ggdb -DDEBUG
 LDFLAGS+= -rdynamic
 LIBS+= -ldl
diff --git a/Makefile b/Makefile
index d97737cb..40d7098a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.104 2009-01-20 22:17:53 nicm Exp $
+# $Id: Makefile,v 1.105 2009-01-21 17:45:19 nicm Exp $
 
 .SUFFIXES: .c .o .y .h
 .PHONY: clean update-index.html upload-index.html
@@ -10,8 +10,7 @@ OS!= uname
 REL!= uname -r
 DATE!= date +%Y%m%d-%H%M
 
-# This must be empty as OpenBSD includes it in default CFLAGS.
-DEBUG=
+FDEBUG= 1
 
 META?= \002 # C-b
 
@@ -56,7 +55,7 @@ CFLAGS+= -DMETA="'${META}'"
 CC= /usr/bin/gcc
 CFLAGS+= -pg -DPROFILE -O0
 .endif
-.ifdef DEBUG
+.ifdef FDEBUG
 CFLAGS+= -g -ggdb -DDEBUG
 LDFLAGS+= -Wl,-E
 CFLAGS+= -DBUILD="\"$(VERSION) ($(DATE))\""
@@ -112,8 +111,8 @@ depend:
 		mkdep ${CFLAGS} ${INCDIRS} ${SRCS:M*.c}
 
 dist:		clean
-		grep '^#DEBUG=' Makefile
-		grep '^#DEBUG=' GNUmakefile
+		grep '^#FDEBUG=' Makefile
+		grep '^#FDEBUG=' GNUmakefile
 		[ "`(grep '^VERSION' Makefile; grep '^VERSION' GNUmakefile)| \
 			uniq -u`" = "" ]
 		tar -zc \