From 548aca0206d1c0c90198d2245d54a92b280d2819 Mon Sep 17 00:00:00 2001
From: sgunderson <sgunderson>
Date: Mon, 18 Feb 2002 02:42:24 +0000
Subject: [PATCH] Now actually _uses_ CPPFLAGS instead of abusing CFLAGS for
 preprocessing flags and using the ugly REAL_CFLAGS solution.

---
 Makefile.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 336d254..cdc7f5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@ VPATH = @srcdir@
 prefix = @prefix@
 
 CFLAGS      = @CFLAGS@
-REAL_CFLAGS = $(CFLAGS) @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
+CPPFLAGS    = @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
 LIBS        = @LIBS@
 OBJS        = disp.o ftpd.o cmds.o nonroot.o ascii.o dcache.o
 ASSMS       = ${OBJS:.o=.s}
@@ -17,9 +17,9 @@ CPPS        = ${OBJS:.o=.i}
 
 # Since we use VPATH, override .c.o rule
 .c.o:	$*.c config.h
-	$(CC) $(REAL_CFLAGS) $(CPPFLAGS) -c @srcdir@/$*.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/$*.c
 .c.s:	$*.c config.h
-	$(CC) $(REAL_CFLAGS) $(CPPFLAGS) -S @srcdir@/$*.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -S @srcdir@/$*.c
 
 # deps
 cmds.o:		@srcdir@/cmds.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/nonroot.h @srcdir@/dcache.h config.h
@@ -30,7 +30,7 @@ ascii.o:	@srcdir@/ascii.c @srcdir@/ascii.h config.h
 dcache.o:	@srcdir@/dcache.c @srcdir@/dcache.h config.h
 
 betaftpd: $(OBJS)
-	$(CC) $(REAL_CFLAGS) -o betaftpd $(OBJS) $(LIBS)
+	$(CC) $(CFLAGS) -o betaftpd $(OBJS) $(LIBS)
 assembly-files: $(ASSMS)
 betaftpd-from-assembly-files: $(ASSMS)
 	$(CC) $(LIBS) -o betaftpd -Wl,--sort-common $(ASSMS)
-- 
2.39.2