Date: Sun, 13 Apr 2014 21:52:28 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264424 - in head/share: examples/etc man/man5 mk Message-ID: <201404132152.s3DLqS02060544@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Apr 13 21:52:27 2014 New Revision: 264424 URL: http://svnweb.freebsd.org/changeset/base/264424 Log: r264402 builds fine, but turns out there are problems with install. Back it out until they can be tracked down. 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 Modified: head/share/examples/etc/make.conf ============================================================================== --- head/share/examples/etc/make.conf Sun Apr 13 21:49:44 2014 (r264423) +++ head/share/examples/etc/make.conf Sun Apr 13 21:52:27 2014 (r264424) @@ -138,7 +138,7 @@ # If you do not want unformatted manual pages to be compressed # when they are installed: # -#WITHOUT_MANCOMPRESS=t +#NO_MANCOMPRESS= # # # Default format for system documentation, depends on your printer. Modified: head/share/man/man5/make.conf.5 ============================================================================== --- head/share/man/man5/make.conf.5 Sun Apr 13 21:49:44 2014 (r264423) +++ head/share/man/man5/make.conf.5 Sun Apr 13 21:52:27 2014 (r264424) @@ -434,11 +434,8 @@ Set this to run .Dq Li "${MAKE} clean" instead of .Dq Li "${MAKE} cleandir" . -.It Va WITH_MANCOMPRESS -.Pq Vt defined -Set to install manual pages compressed. -.It Va WITHOUT_MANCOMPRESS -.Pq Vt defined +.It Va NO_MANCOMPRESS +.Pq Vt bool Set to install manual pages uncompressed. .It Va NO_SHARE .Pq Vt bool Modified: head/share/mk/bsd.man.mk ============================================================================== --- head/share/mk/bsd.man.mk Sun Apr 13 21:49:44 2014 (r264423) +++ head/share/mk/bsd.man.mk Sun Apr 13 21:52:27 2014 (r264424) @@ -30,6 +30,9 @@ # 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 @@ -74,10 +77,10 @@ MAN+= ${MAN${__sect}} _manpages: all-man: _manpages -.if ${MK_MANCOMPRESS} != "no" +.if defined(NO_MANCOMPRESS) # Make special arrangements to filter to a temporary file at build time -# for MK_MANCOMPRESS == no. +# for NO_MANCOMPRESS. .if defined(MANFILTER) FILTEXTENSION= .filt .else @@ -159,7 +162,7 @@ maninstall: _maninstall _maninstall: .if defined(MAN) && !empty(MAN) _maninstall: ${MAN} -.if ${MK_MANCOMPRESS} == "no" +.if defined(NO_MANCOMPRESS) .if defined(MANFILTER) .for __page in ${MAN} ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Sun Apr 13 21:49:44 2014 (r264423) +++ head/share/mk/bsd.own.mk Sun Apr 13 21:52:27 2014 (r264424) @@ -301,7 +301,6 @@ __DEFAULT_YES_OPTIONS = \ MAILWRAPPER \ MAKE \ MAN \ - MANCOMPRESS \ NCURSESW \ NDIS \ NETCAT \ @@ -459,14 +458,11 @@ MK_${var}:= no # Supported NO_* options (if defined, MK_* will be forced to "no", # regardless of user's setting). # -# These are transitional and will disappaer in the fullness of time. -# .for var in \ CTF \ DEBUG_FILES \ INSTALLLIB \ MAN \ - MANCOMPRESS \ PROFILE .if defined(NO_${var}) MK_${var}:=no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404132152.s3DLqS02060544>