1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
Description: Don't use hardcoded system header locations
Author: Helmut Grohne <helmut@subdivi.de>
Date: 2018-10-02
Bugs-Debian: https://bugs.debian.org/910097
Forwarded: not-yet
--- a/ipppd/lcp.c
+++ b/ipppd/lcp.c
@@ -51,10 +51,10 @@
#ifdef __linux__ /* Needs ppp ioctls */
#if defined __GLIBC__ && __GLIBC__ >= 2
-# include </usr/include/net/if.h>
-# include </usr/include/net/if_ppp.h>
+# include <net/if.h>
+# include <net/if_ppp.h>
#else
-# include </usr/include/net/if.h>
+# include <net/if.h>
# include <linux/if_ppp.h>
#endif
#endif
--- a/ipppd/main.c
+++ b/ipppd/main.c
@@ -48,7 +48,7 @@
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/socket.h>
-#include </usr/include/net/if.h>
+#include <net/if.h>
#include "fsm.h"
#include "ipppd.h"
--- a/ipppd/sys-linux.c
+++ b/ipppd/sys-linux.c
@@ -51,14 +51,14 @@
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include </usr/include/net/if.h>
-#include </usr/include/net/if_arp.h>
-#include </usr/include/net/route.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/route.h>
#if defined __GLIBC__ && __GLIBC__ >= 2
-# include </usr/include/net/ppp_defs.h>
-# include </usr/include/net/if_ppp.h>
+# include <net/ppp_defs.h>
+# include <net/if_ppp.h>
# include "ippp-filter-compat.h"
-# include </usr/include/net/ethernet.h>
+# include <net/ethernet.h>
# include "route.h"
#else
# include <linux/ppp_defs.h>
--- a/ipppstats/ipppstats.c
+++ b/ipppstats/ipppstats.c
@@ -54,8 +54,8 @@
#include <sys/ioctl.h>
#if defined __GLIBC__ && __GLIBC__ >= 2
-# include </usr/include/net/ppp_defs.h>
-# include </usr/include/net/if.h>
+# include <net/ppp_defs.h>
+# include <net/if.h>
#else
# include <linux/ppp_defs.h>
# include <linux/if.h>
@@ -65,7 +65,7 @@
#ifndef STREAMS
# if defined __GLIBC__ && __GLIBC__ >= 2
-# include </usr/include/net/if_ppp.h>
+# include <net/if_ppp.h>
# else
# include <linux/if_ppp.h> /* BSD, Linux, NeXT, etc. */
# endif
--- a/scripts/lxdialog/Makefile
+++ b/scripts/lxdialog/Makefile
@@ -6,13 +6,13 @@
LDFLAGS = -s -L .
LDLIBS = -lncurses
-ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
- CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
+ifeq ($(shell echo '#include <ncurses/ncurses.h>' | ${CC} -E - >/dev/null 2>&1 && echo yes),yes)
+ CFLAGS += -DCURSES_LOC="<ncurses/ncurses.h>"
else
-ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
- CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+ifeq ($(shell echo '#include <ncurses/curses.h>' | ${CC} -E - >/dev/null 2>&1 && echo yes),yes)
+ CFLAGS += -DCURSES_LOC="<ncurses/curses.h>"
else
-ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
+ifeq ($(shell echo '#include <ncurses.h>' | ${CC} -E - >/dev/null 2>&1 && echo yes),yes)
CFLAGS += -DCURSES_LOC="<ncurses.h>"
else
CFLAGS += -DCURSES_LOC="<curses.h>"
|
