diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2003-06-24 23:39:42 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2003-06-24 23:39:42 +0000 |
| commit | 30f3b97b75974d0e9b8de50f0e555960c271e50b (patch) | |
| tree | a55e9fec049efbdaa843c707a39275b4a2e19332 /net/poptop | |
| parent | * This should fix the build error on bento. (diff) | |
Fix CFLAGS handling in Makefile.am/.in.
PR: 53135
Reported by: Sergey Akifyev <asa@gascom.ru>
Notes
Notes:
svn path=/head/; revision=83551
Diffstat (limited to 'net/poptop')
| -rw-r--r-- | net/poptop/files/patch-ab | 9 | ||||
| -rw-r--r-- | net/poptop/files/patch-ac | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/net/poptop/files/patch-ab b/net/poptop/files/patch-ab index a470af757529..61ee35c674c8 100644 --- a/net/poptop/files/patch-ab +++ b/net/poptop/files/patch-ab @@ -1,11 +1,14 @@ ---- Makefile.in.orig Sat May 3 17:54:08 2003 -+++ Makefile.in Sat May 3 17:55:08 2003 + +$FreeBSD$ + +--- Makefile.in.orig Thu Feb 27 16:41:21 2003 ++++ Makefile.in Wed Jun 25 01:35:11 2003 @@ -75,7 +75,7 @@ AUTOMAKE_OPTIONS = no-dependencies foreign INCLUDES = -I. -CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -+CFLAGS+= -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' ++CFLAGS= @CFLAGS@ -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' diff --git a/net/poptop/files/patch-ac b/net/poptop/files/patch-ac index b8afbd1d8efb..a07f21eb17b9 100644 --- a/net/poptop/files/patch-ac +++ b/net/poptop/files/patch-ac @@ -1,11 +1,14 @@ ---- Makefile.am.orig Sat May 3 17:55:55 2003 -+++ Makefile.am Sat May 3 17:56:22 2003 + +$FreeBSD$ + +--- Makefile.am.orig Thu Feb 27 16:41:20 2003 ++++ Makefile.am Wed Jun 25 01:34:22 2003 @@ -11,7 +11,7 @@ ## warning with -Wmissing-prototypes). ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers ## aren't up to it). -CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -+CFLAGS = ${CFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' ++CFLAGS = @CFLAGS@ -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' |