diff options
Diffstat (limited to 'lib/libncurses')
-rw-r--r-- | lib/libncurses/Makefile | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index f73af6c..0bad7af 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -34,8 +34,8 @@ ONEUL= 1UL .PATH: ${NCURSES}/include .PATH: ${NCURSES}/man -INCS= -I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include -CFLAGS+=${INCS} -Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS +CFLAGS+=-I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include +CFLAGS+=-Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS GENSRC= \ codes.c \ @@ -60,6 +60,8 @@ GENHDR= \ # Installed HEADERS=curses.h term.h termcap.h unctrl.h SRCHDRS=ncurses_dll.h +INCS= ${HEADERS} ${SRCHDRS} +INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h # Components of names.c and codes.c NAMESRC=boolnames boolfnames numnames numfnames strnames strfnames @@ -251,15 +253,6 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a DOCSDIR= /usr/share/doc/ncurses DOCS= ncurses-intro.html hackguide.html -beforeinstall: ${HEADERS} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${HEADERS} \ - ${DESTDIR}/usr/include - cd ${NCURSES}/include ; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SRCHDRS} \ - ${DESTDIR}/usr/include - rm -f ${DESTDIR}/usr/include/ncurses.h - ln -s curses.h ${DESTDIR}/usr/include/ncurses.h - .if !defined(NOHTML) afterinstall: .for file in ${DOCS} @@ -282,7 +275,7 @@ codes.c: namehdr ${CODESRC} codeftr cat namehdr ${CODESRC} codeftr > $@ lib_gen.c: MKlib_gen.sh curses.h - sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \ + sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \ "${AWK}" < curses.h >$@ lib_keyname.c: keys.list MKkeyname.awk @@ -308,7 +301,7 @@ ncurses_def.h: MKncurses_def.sh ncurses_defs ${NCURSES}/include/ncurses_defs > ncurses_def.h nomacros.h: MKlib_gen.sh curses.h - sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \ + sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \ "${AWK}" < curses.h | fgrep undef > $@ init_keytry.h: keys.list make_keys |