diff options
author | imp <imp@FreeBSD.org> | 2014-04-13 21:52:27 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-04-13 21:52:27 +0000 |
commit | 7c832345fbcf8eb065f31321a722f8dbfaee8e5e (patch) | |
tree | 40546d016001c55d4ef75965f3e3a015f2fb1913 | |
parent | e539c25cad906969f51d4018f480880e690ea0a6 (diff) | |
download | FreeBSD-src-7c832345fbcf8eb065f31321a722f8dbfaee8e5e.zip FreeBSD-src-7c832345fbcf8eb065f31321a722f8dbfaee8e5e.tar.gz |
r264402 builds fine, but turns out there are problems with
install. Back it out until they can be tracked down.
-rw-r--r-- | share/examples/etc/make.conf | 2 | ||||
-rw-r--r-- | share/man/man5/make.conf.5 | 7 | ||||
-rw-r--r-- | share/mk/bsd.man.mk | 9 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 4 |
4 files changed, 9 insertions, 13 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 5a52933..6774deb 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -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. diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 2480b84..7430a09 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -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 diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 7c1448b..6445ba3 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -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} \ diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 2f69266..5088236 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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 |