[patches.git] / iputils-makefile.patch

Respect user environment variables.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/Makefile b/Makefile
index 54c1de5..7a7b045 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,18 @@
 # Path to parent kernel include files directory
 LIBC_INCLUDE=/usr/include
 
-DEFINES= 
-
 #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
 LDLIBS=-lresolv
-ADDLIB=
 
 #options if you compile with libc5, and without a bind>=4.9.4 libresolv
 # NOT AVAILABLE. Please, use libresolv.
 
-CC=gcc
+CC ?= gcc
 # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
 #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
-CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
+CFLAGS ?= -O2 -g
+CFLAGS += -Wstrict-prototypes -Wall
+CPPFLAGS += -D_GNU_SOURCE
 
 IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
 IPV6_TARGETS=tracepath6 traceroute6 ping6
@@ -33,9 +31,8 @@ ping.o ping6.o ping_common.o: ping_common.h
 tftpd.o tftpsubs.o: tftp.h
 
 rdisc_srv: rdisc_srv.o
-
 rdisc_srv.o: rdisc.c
-	$(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
 
 
 check-kernel:
Commit	Line	Data
5e993f12	1	Respect user environment variables.
	2
	3	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
	4
	5	diff --git a/Makefile b/Makefile
	6	index 54c1de5..7a7b045 100644
	7	--- a/Makefile
	8	+++ b/Makefile
	9	@@ -1,20 +1,18 @@
	10	# Path to parent kernel include files directory
	11	LIBC_INCLUDE=/usr/include
	12
	13	-DEFINES=
	14	-
	15	#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
	16	LDLIBS=-lresolv
	17	-ADDLIB=
	18
	19	#options if you compile with libc5, and without a bind>=4.9.4 libresolv
	20	# NOT AVAILABLE. Please, use libresolv.
	21
	22	-CC=gcc
	23	+CC ?= gcc
	24	# What a pity, all new gccs are buggy and -Werror does not work. Sigh.
	25	#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
	26	-CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
	27	-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
	28	+CFLAGS ?= -O2 -g
	29	+CFLAGS += -Wstrict-prototypes -Wall
	30	+CPPFLAGS += -D_GNU_SOURCE
	31
	32	IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
	33	IPV6_TARGETS=tracepath6 traceroute6 ping6
	34	@@ -33,9 +31,8 @@ ping.o ping6.o ping_common.o: ping_common.h
	35	tftpd.o tftpsubs.o: tftp.h
	36
	37	rdisc_srv: rdisc_srv.o
	38	-
	39	rdisc_srv.o: rdisc.c
	40	- $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
	41	+ $(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
	42
	43
	44	check-kernel: