diff options
| author | rafan <rafan@FreeBSD.org> | 2007-05-25 02:27:46 +0000 |
|---|---|---|
| committer | rafan <rafan@FreeBSD.org> | 2007-05-25 02:27:46 +0000 |
| commit | 7aa668468b36e99ca00ccaaf06a56067b4d4cc10 (patch) | |
| tree | 143a56ecfc4605eb0e38e844ac854eb50212ed7e /lib/ncurses/ncurses | |
| parent | 6ed23d60743b4281411077eaade3508ac22b6df4 (diff) | |
| download | FreeBSD-src-7aa668468b36e99ca00ccaaf06a56067b4d4cc10.zip FreeBSD-src-7aa668468b36e99ca00ccaaf06a56067b4d4cc10.tar.gz | |
- When I introduce wide character enabled ncurses into base, all headers
are installed twice (once in non-widec version, onec in widec version).
Headers with widec enabled are compatible with non-widec version
for libraries. However, if you do a repeat build/install, the curses.h
is always overwritten. The reason is that headers and statics libraries
are installed with -S option to preserve their mtime if no actual changes,
which saves time when doing incremental builds. The curses.h is installed
by non-widec ncurses first, then by widec ncurses. So next time, it happens
again. You see something like this:
# pwd
/usr/src/lib/ncurses
# make -s installincludes INSTALL="install -v"
===> ncurses (installincludes)
install: curses.h -> /usr/include/curses.h
===> ncursesw (installincludes)
install: curses.h -> /usr/include/curses.h
# make -s installincludes INSTALL="install -v"
===> ncurses (installincludes)
install: curses.h -> /usr/include/curses.h
===> ncursesw (installincludes)
install: curses.h -> /usr/include/curses.h
The solution is to disable installing headers in non-widec version. Now
you see this:
# pwd
/usr/src/lib/ncurses
# make -s installincludes INSTALL="install -v"
===> ncurses (installincludes)
===> ncursesw (installincludes)
# make -s installincludes INSTALL="install -v"
===> ncurses (installincludes)
===> ncursesw (installincludes)
For form/panel/menu libraries, the headers are the same for both version.
To be consistent with ncurses, I also disable the installation in non-widec
version.
Reported by: des
Reviewed by: ru
Thanks to: ru
Approved by: delphij (mentor)
MFC after: 2 weeks
Diffstat (limited to 'lib/ncurses/ncurses')
| -rw-r--r-- | lib/ncurses/ncurses/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 53b2d31..0876f9d 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -274,8 +274,11 @@ CFLAGS+= -DFREEBSD_NATIVE -DTERMIOS # Installed HEADERS= curses.h term.h termcap.h unctrl.h SRCHDRS= ncurses_dll.h + +.if defined(ENABLE_WIDEC) INCS= ${HEADERS} ${SRCHDRS} INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h +.endif .if !defined(NO_INSTALLLIB) SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a |
