From owner-svn-src-all@FreeBSD.ORG Thu Jan 24 16:38:49 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 279EE610; Thu, 24 Jan 2013 16:38:49 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0A3C8403; Thu, 24 Jan 2013 16:38:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0OGcm7j004893; Thu, 24 Jan 2013 16:38:48 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0OGcmN7004886; Thu, 24 Jan 2013 16:38:48 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201301241638.r0OGcmN7004886@svn.freebsd.org> From: Brooks Davis Date: Thu, 24 Jan 2013 16:38:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245887 - in head/lib/ncurses: form menu ncurses panel X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2013 16:38:49 -0000 Author: brooks Date: Thu Jan 24 16:38:47 2013 New Revision: 245887 URL: http://svnweb.freebsd.org/changeset/base/245887 Log: 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: head/lib/ncurses/form/Makefile head/lib/ncurses/menu/Makefile head/lib/ncurses/ncurses/Makefile head/lib/ncurses/panel/Makefile Modified: head/lib/ncurses/form/Makefile ============================================================================== --- head/lib/ncurses/form/Makefile Thu Jan 24 16:28:37 2013 (r245886) +++ head/lib/ncurses/form/Makefile Thu Jan 24 16:38:47 2013 (r245887) @@ -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 Modified: head/lib/ncurses/menu/Makefile ============================================================================== --- head/lib/ncurses/menu/Makefile Thu Jan 24 16:28:37 2013 (r245886) +++ head/lib/ncurses/menu/Makefile Thu Jan 24 16:38:47 2013 (r245887) @@ -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 Modified: head/lib/ncurses/ncurses/Makefile ============================================================================== --- head/lib/ncurses/ncurses/Makefile Thu Jan 24 16:28:37 2013 (r245886) +++ head/lib/ncurses/ncurses/Makefile Thu Jan 24 16:38:47 2013 (r245887) @@ -2,6 +2,10 @@ SHLIBDIR?= /lib +.if !defined(ENABLE_WIDEC) +NO_MAN= +.endif + .include .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: head/lib/ncurses/panel/Makefile ============================================================================== --- head/lib/ncurses/panel/Makefile Thu Jan 24 16:28:37 2013 (r245886) +++ head/lib/ncurses/panel/Makefile Thu Jan 24 16:38:47 2013 (r245887) @@ -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