Date: Sun, 13 Apr 2014 15:32:46 -0400 From: Mark Johnston <markj@freebsd.org> To: Warner Losh <imp@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org> Subject: Re: svn commit: r264402 - in head/share: examples/etc man/man5 mk Message-ID: <CAMw1wOyhL12L9uNVwNxT445851sPURMQNazHCqBER20-PGjMdw@mail.gmail.com> In-Reply-To: <201404130522.s3D5MRXc053006@svn.freebsd.org> References: <201404130522.s3D5MRXc053006@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Apr 13, 2014 at 1:22 AM, Warner Losh <imp@freebsd.org> wrote: > Author: imp > Date: Sun Apr 13 05:22:26 2014 > New Revision: 264402 > URL: http://svnweb.freebsd.org/changeset/base/264402 > > Log: > Convert NO_MANCOMPRESS to normal convention. This breaks installworld for me with ... install -o root -g wheel -m 444 zh_CN.GB2312.cat /usr/share/nls/zh_CN.GB2312/libc.cat install -o root -g wheel -m 444 zh_CN.UTF-8.cat /usr/share/nls/zh_CN.UTF-8/libc.cat install -o root -g wheel -m 444 btree.3.gz /usr/share/man/man3 install: btree.3.gz: No such file or directory *** Error code 71 ... > > Modified: > head/share/examples/etc/make.conf > head/share/man/man5/make.conf.5 > head/share/mk/bsd.man.mk > head/share/mk/bsd.own.mk > > [snip] > > Modified: head/share/mk/bsd.man.mk > ============================================================================== > --- head/share/mk/bsd.man.mk Sun Apr 13 05:22:22 2014 (r264401) > +++ head/share/mk/bsd.man.mk Sun Apr 13 05:22:26 2014 (r264402) > @@ -30,9 +30,6 @@ > # second, and there may be multiple pairs. The files > # are hard-linked. > # > -# NO_MANCOMPRESS If you do not want unformatted manual pages to be > -# compressed when they are installed. [not set] > -# > # NO_MLINKS If you do not want install manual page links. [not set] > # > # MANFILTER command to pipe the raw man page through before compressing > @@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}} > _manpages: > all-man: _manpages > > -.if defined(NO_MANCOMPRESS) > +.if ${MK_MANCOMPRESS} != "no" > > # Make special arrangements to filter to a temporary file at build time > -# for NO_MANCOMPRESS. > +# for MK_MANCOMPRESS == no. > .if defined(MANFILTER) > FILTEXTENSION= .filt > .else > @@ -162,7 +159,7 @@ maninstall: _maninstall > _maninstall: > .if defined(MAN) && !empty(MAN) > _maninstall: ${MAN} > -.if defined(NO_MANCOMPRESS) > +.if ${MK_MANCOMPRESS} == "no" Changing this line to ".if ${MK_MANCOMPRESS} != "no" seems to fix the problem. > .if defined(MANFILTER) > [snip]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMw1wOyhL12L9uNVwNxT445851sPURMQNazHCqBER20-PGjMdw>