From b289ec4c473338c67bce0cb5712616da2d2493e8 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Tue, 13 Jan 2004 03:57:55 +0000
Subject: [PATCH] Change some Makefile.linux files to use COPTS and CFLAGS the
 same way that pppd/Makefile.linux does.

---
 chat/Makefile.linux                  | 5 +++--
 pppd/plugins/Makefile.linux          | 3 ++-
 pppd/plugins/rp-pppoe/Makefile.linux | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/chat/Makefile.linux b/chat/Makefile.linux
index 6568cbb..c4d6bf2 100644
--- a/chat/Makefile.linux
+++ b/chat/Makefile.linux
@@ -1,4 +1,4 @@
-#	$Id: Makefile.linux,v 1.9 1999/08/13 01:54:32 paulus Exp $
+#	$Id: Makefile.linux,v 1.10 2004/01/13 03:57:55 paulus Exp $
 
 CDEF1=	-DTERMIOS			# Use the termios structure
 CDEF2=	-DSIGTYPE=void			# Standard definition
@@ -6,7 +6,8 @@ CDEF3=	-UNO_SLEEP			# Use the usleep function
 CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
 CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
 
-CFLAGS=	-O2 -g -pipe $(CDEFS)
+COPTS=	-O2 -g -pipe $(CDEFS)
+CFLAGS=	$(COPTS) $(CDEFS)
 
 INSTALL= install
 
diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index a7cf5d8..2fabeba 100644
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -1,5 +1,6 @@
 CC	= gcc
-CFLAGS	= -g -O2 -I.. -I../../include -fPIC
+COPTS	= -O2 -g
+CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
 LDFLAGS	= -shared
 INSTALL	= install -o root
 
diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
index 078f158..bbb8ba9 100644
--- a/pppd/plugins/rp-pppoe/Makefile.linux
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
@@ -10,13 +10,14 @@
 # This program may be distributed according to the terms of the GNU
 # General Public License, version 2 or (at your option) any later version.
 #
-# $Id: Makefile.linux,v 1.1 2001/12/14 02:55:20 mostrows Exp $
+# $Id: Makefile.linux,v 1.2 2004/01/13 03:57:55 paulus Exp $
 #***********************************************************************
 
 # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
 VERSION=3.3
 
-CFLAGS+=-I../../../include/linux
+COPTS=-O2 -g
+CFLAGS=$(COPTS) -I../../../include/linux
 all: rp-pppoe.so
 
 rp-pppoe.so: libplugin.a plugin.o
-- 
2.39.2