aboutsummaryrefslogtreecommitdiff
path: root/lib/ncurses
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2007-05-25 02:27:46 +0000
committerRong-En Fan <rafan@FreeBSD.org>2007-05-25 02:27:46 +0000
commit4409495bc80e5168216d5900fac8ff1d84482f7a (patch)
tree143a56ecfc4605eb0e38e844ac854eb50212ed7e /lib/ncurses
parentfdd54a53de43774874b7d1db17811a530c28fa76 (diff)
downloadsrc-4409495bc80e5168216d5900fac8ff1d84482f7a.tar.gz
src-4409495bc80e5168216d5900fac8ff1d84482f7a.zip
- 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
Notes
Notes: svn path=/head/; revision=169971
Diffstat (limited to 'lib/ncurses')
-rw-r--r--lib/ncurses/form/Makefile2
-rw-r--r--lib/ncurses/menu/Makefile2
-rw-r--r--lib/ncurses/ncurses/Makefile3
-rw-r--r--lib/ncurses/panel/Makefile2
4 files changed, 9 insertions, 0 deletions
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index faeb973e28d3..fe89d4546aac 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -57,7 +57,9 @@ CFLAGS+= -I${NCURSES_DIR}/menu
DPADD= ${LIBNCURSES${LIB_SUFFIX:U}}
LDADD= -lncurses${LIB_SUFFIX}
+.if defined(ENABLE_WIDEC)
INCS= form.h
+.endif
.PATH: ${NCURSES_DIR}/man
MAN= \
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index 96bd0d03b380..a853d8c8a83a 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -43,7 +43,9 @@ CFLAGS+= -I${SRCDIR}
DPADD= ${LIBNCURSES${LIB_SUFFIX:U}}
LDADD= -lncurses${LIB_SUFFIX}
+.if defined(ENABLE_WIDEC)
INCS= menu.h eti.h
+.endif
.PATH: ${NCURSES_DIR}/man
MAN= \
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 53b2d3144040..0876f9d07b30 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
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index 1f734915b035..12b8b066dc12 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -32,7 +32,9 @@ CFLAGS+= -I${SRCDIR}
DPADD= ${LIBNCURSES${LIB_SUFFIX:U}}
LDADD= -lncurses${LIB_SUFFIX}
+.if defined(ENABLE_WIDEC)
INCS= panel.h
+.endif
# generate MAN
.PATH: ${NCURSES_DIR}/man