cdf0c2cfd7
The current code does this: if [ -f /usr/include/ncursesw/curses.h ]; then echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"' elif [ -f /usr/include/ncurses/ncurses.h ]; then echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' elif [ -f /usr/include/ncurses/curses.h ]; then echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"' [...] This is merely inconsistent: - adding the full path to the directory in the -I directive, - especially since that path is already a sub-path of the system include path, - and then repeating the sub-path in the #include directive. Rationalise each include directive: - only use the filename in the #include directive, - keep the -I directives: they are always searched for before the system include path; this ensures the correct header is used. Using the -I directives and the filename-only in #include is more in line with how pkg-config behaves, eg.: $ pkg-config --cflags ncursesw -I/usr/include/ncursesw This paves the way for using pkg-config for CFLAGS, too, now we use it to find the libraries. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> |
||
---|---|---|
.. | ||
lxdialog | ||
.gitignore | ||
check.sh | ||
conf.c | ||
confdata.c | ||
expr.c | ||
expr.h | ||
gconf.c | ||
gconf.glade | ||
images.c | ||
kxgettext.c | ||
list.h | ||
lkc.h | ||
lkc_proto.h | ||
Makefile | ||
mconf.c | ||
menu.c | ||
merge_config.sh | ||
nconf.c | ||
nconf.gui.c | ||
nconf.h | ||
POTFILES.in | ||
qconf.cc | ||
qconf.h | ||
streamline_config.pl | ||
symbol.c | ||
util.c | ||
zconf.gperf | ||
zconf.hash.c_shipped | ||
zconf.l | ||
zconf.lex.c_shipped | ||
zconf.tab.c_shipped | ||
zconf.y |