Author: brooks
Date: Fri Mar 15 22:31:51 2013
New Revision: 248358
URL: http://svnweb.freebsd.org/changeset/base/248358
Log:
MFC r245887
Only install manpages and html documentation in the ncurses/*w (wchar)
builds so that it is only installed once. This is consistent with the
existing decision to only install headers in the that case.
Modified:
stable/9/lib/ncurses/form/Makefile
stable/9/lib/ncurses/menu/Makefile
stable/9/lib/ncurses/ncurses/Makefile
stable/9/lib/ncurses/panel/Makefile
Directory Properties:
stable/9/lib/ncurses/form/ (props changed)
stable/9/lib/ncurses/menu/ (props changed)
stable/9/lib/ncurses/ncurses/ (props changed)
stable/9/lib/ncurses/panel/ (props changed)
Modified: stable/9/lib/ncurses/form/Makefile
==============================================================================
--- stable/9/lib/ncurses/form/Makefile Fri Mar 15 22:26:19 2013
(r248357)
+++ stable/9/lib/ncurses/form/Makefile Fri Mar 15 22:31:51 2013
(r248358)
@@ -59,7 +59,6 @@ LDADD= -lncurses${LIB_SUFFIX}
.if defined(ENABLE_WIDEC)
INCS= form.h
-.endif
.PATH: ${NCURSES_DIR}/man
MAN= \
@@ -157,6 +156,9 @@ MLINKS= form_cursor.3 pos_form_cursor.3
form_win.3 scale_form.3 \
form_win.3 set_form_sub.3 \
form_win.3 set_form_win.3
+.else
+NO_MAN=
+.endif
.include <bsd.lib.mk>
Modified: stable/9/lib/ncurses/menu/Makefile
==============================================================================
--- stable/9/lib/ncurses/menu/Makefile Fri Mar 15 22:26:19 2013
(r248357)
+++ stable/9/lib/ncurses/menu/Makefile Fri Mar 15 22:31:51 2013
(r248358)
@@ -45,7 +45,6 @@ LDADD= -lncurses${LIB_SUFFIX}
.if defined(ENABLE_WIDEC)
INCS= menu.h eti.h
-.endif
.PATH: ${NCURSES_DIR}/man
MAN= \
@@ -130,6 +129,9 @@ MLINKS= menu_attributes.3 menu_back.3 \
mitem_value.3 item_value.3 \
mitem_value.3 set_item_value.3 \
mitem_visible.3 item_visible.3
+.else
+NO_MAN=
+.endif
.include <bsd.lib.mk>
Modified: stable/9/lib/ncurses/ncurses/Makefile
==============================================================================
--- stable/9/lib/ncurses/ncurses/Makefile Fri Mar 15 22:26:19 2013
(r248357)
+++ stable/9/lib/ncurses/ncurses/Makefile Fri Mar 15 22:31:51 2013
(r248358)
@@ -2,6 +2,10 @@
SHLIBDIR?= /lib
+.if !defined(ENABLE_WIDEC)
+NO_MAN=
+.endif
+
.include <bsd.own.mk>
.include "${.CURDIR}/../config.mk"
@@ -304,8 +308,10 @@ SYMLINKS+= libncurses${LIB_SUFFIX}_p.a $
SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtinfo${LIB_SUFFIX}_p.a
.endif
+.if defined(ENABLE_WIDEC)
DOCSDIR= ${SHAREDIR}/doc/ncurses
DOCS= ncurses-intro.html hackguide.html
+.endif
.if ${MK_HTML} != "no"
.PATH: ${NCURSES_DIR}/doc/html
@@ -457,6 +463,7 @@ terminfo.5: MKterminfo.sh terminfo.head
CLEANFILES+= terminfo.5
+.if defined(ENABLE_WIDEC)
.PATH: ${NCURSES_DIR}/man
MAN= \
curs_addch.3 \
@@ -517,7 +524,6 @@ MAN= \
resizeterm.3 \
wresize.3
-.if defined(ENABLE_WIDEC)
MAN+= \
curs_add_wch.3 \
curs_add_wchstr.3 \
Modified: stable/9/lib/ncurses/panel/Makefile
==============================================================================
--- stable/9/lib/ncurses/panel/Makefile Fri Mar 15 22:26:19 2013
(r248357)
+++ stable/9/lib/ncurses/panel/Makefile Fri Mar 15 22:31:51 2013
(r248358)
@@ -34,7 +34,6 @@ LDADD= -lncurses${LIB_SUFFIX}
.if defined(ENABLE_WIDEC)
INCS= panel.h
-.endif
# generate MAN
.PATH: ${NCURSES_DIR}/man
@@ -58,6 +57,9 @@ MLINKS= panel.3 bottom_panel.3 \
panel.3 show_panel.3 \
panel.3 top_panel.3 \
panel.3 update_panels.3
+.else
+NO_MAN=
+.endif
.include <bsd.lib.mk>
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
