(CFLAGS, CPPFLAGS): POSIX make has only CFLAGS. Fold CPPFLAGS into

CFLAGS.  Use CFLAGS when linking, to match POSIX make implicit rule.

diff --git a/src/client/Makefile.in b/src/client/Makefile.in
index e6dabd58594521756c677f436385530c7bf8c1e5..faa6264e84f9267fb5fa62f8bd444d3b15fa5b97 100644 (file)
--- 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)