From ae6acc09cee7e95cb28f836a2320f6d0c66e1dc0 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 18 Mar 2006 17:46:32 +0000
Subject: [PATCH] (CFLAGS, CPPFLAGS): POSIX make has only CFLAGS.  Fold
 CPPFLAGS into CFLAGS.  Use CFLAGS when linking, to match POSIX make implicit
 rule.

---
 src/client/Makefile.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/client/Makefile.in b/src/client/Makefile.in
index e6dabd58..faa6264e 100644
--- a/src/client/Makefile.in
+++ b/src/client/Makefile.in
@@ -33,8 +33,7 @@
 # 
 
 CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@ @DEFS@ -I.
+CFLAGS = @CFLAGS@ @CPPFLAGS@ @DEFS@ -I.
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 E = @EXEEXT@
@@ -59,7 +58,7 @@ saveargv.$O servcmd.$O serverio.$O tags.$O termio.$O termlib.$O
 all: $(prog)
 
 $(prog): $(obj)
-	$(CC) $(LDFLAGS) -o empire $(obj) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o empire $(obj) $(LIBS)
 
 clean:
 	rm -f $(obj) $(prog)