Fix CFLAGS handling in Makefile.am/.in.

PR:		53135
Reported by:	Sergey Akifyev <asa@gascom.ru>
This commit is contained in:
Christian Weisgerber 2003-06-24 23:39:42 +00:00
parent a3882471ad
commit 30f3b97b75
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=83551
2 changed files with 12 additions and 6 deletions

View file

@ -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)"'

View file

@ -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)"'