From owner-cvs-src@FreeBSD.ORG Fri May 25 02:27:46 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EA5A316A41F; Fri, 25 May 2007 02:27:46 +0000 (UTC) (envelope-from rafan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DEB5913C44C; Fri, 25 May 2007 02:27:46 +0000 (UTC) (envelope-from rafan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4P2RkPj098800; Fri, 25 May 2007 02:27:46 GMT (envelope-from rafan@repoman.freebsd.org) Received: (from rafan@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4P2RkgR098796; Fri, 25 May 2007 02:27:46 GMT (envelope-from rafan) Message-Id: <200705250227.l4P2RkgR098796@repoman.freebsd.org> From: Rong-En Fan Date: Fri, 25 May 2007 02:27:46 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/lib/ncurses/form Makefile src/lib/ncurses/menu Makefile src/lib/ncurses/ncurses Makefile src/lib/ncurses/panel Makefile X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 May 2007 02:27:47 -0000 rafan 2007-05-25 02:27:46 UTC FreeBSD src repository Modified files: lib/ncurses/form Makefile lib/ncurses/menu Makefile lib/ncurses/ncurses Makefile lib/ncurses/panel Makefile Log: - 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 Revision Changes Path 1.14 +2 -0 src/lib/ncurses/form/Makefile 1.16 +2 -0 src/lib/ncurses/menu/Makefile 1.90 +3 -0 src/lib/ncurses/ncurses/Makefile 1.15 +2 -0 src/lib/ncurses/panel/Makefile