From: sgunderson <sgunderson>
Date: Thu, 17 Aug 2000 21:58:50 +0000 (+0000)
Subject: CFLAGS can now be overridden on the command line without compilation problems (eases... 
X-Git-Url: https://git.sesse.net/?p=betaftpd;a=commitdiff_plain;h=9b44cdee547854e66a7cc29c425df66455760388

CFLAGS can now be overridden on the command line without compilation problems (eases Debian package building, among others).
---

diff --git a/Makefile.in b/Makefile.in
index 41dad5c..2fb3e65 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,17 +8,18 @@ CC = @CC@
 VPATH = @srcdir@
 prefix = @prefix@
 
-CFLAGS = @CFLAGS@ @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
-LIBS   = @LIBS@
-OBJS   = disp.o ftpd.o cmds.o nonroot.o ascii.o
-ASSMS  = disp.s ftpd.s cmds.s nonroot.s ascii.s
-CPPS   = disp.i ftpd.i cmds.i nonroot.i ascii.i
+CFLAGS      = @CFLAGS@
+REAL_CFLAGS = $(CFLAGS) @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
+LIBS        = @LIBS@
+OBJS        = disp.o ftpd.o cmds.o nonroot.o ascii.o
+ASSMS       = disp.s ftpd.s cmds.s nonroot.s ascii.s
+CPPS        = disp.i ftpd.i cmds.i nonroot.i ascii.i
 
 # Since we use VPATH, override .c.o rule
 .c.o:	$*.c config.h
-	$(CC) $(CFLAGS) -c @srcdir@/$*.c
+	$(CC) $(REAL_CFLAGS) -c @srcdir@/$*.c
 .c.s:	$*.c config.h
-	$(CC) $(CFLAGS) -S @srcdir@/$*.c
+	$(CC) $(REAL_CFLAGS) -S @srcdir@/$*.c
 
 # deps
 cmds.o:		@srcdir@/cmds.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/nonroot.h config.h
@@ -28,7 +29,7 @@ nonroot.o:	@srcdir@/nonroot.c @srcdir@/nonroot.h config.h
 ascii.o:	@srcdir@/ascii.c config.h
 
 betaftpd: $(OBJS)
-	$(CC) $(CFLAGS) $(LIBS) -o betaftpd $(OBJS)
+	$(CC) $(REAL_CFLAGS) $(LIBS) -o betaftpd $(OBJS)
 assembly-files: $(ASSMS)
 betaftpd-from-assembly-files: $(ASSMS)
 	$(CC) $(LIBS) -o betaftpd -Wl,--sort-common $(ASSMS)