diff options
author | ngie <ngie@FreeBSD.org> | 2014-12-31 23:25:37 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2014-12-31 23:25:37 +0000 |
commit | d4c625976a2fea5fc437c319a55efef1bcc29c2c (patch) | |
tree | 598489661071937f5a8c541a42e28c07b21b569b /share | |
parent | 649535f73cbb860495bc6d26c156d95935fcb6fd (diff) | |
download | FreeBSD-src-d4c625976a2fea5fc437c319a55efef1bcc29c2c.zip FreeBSD-src-d4c625976a2fea5fc437c319a55efef1bcc29c2c.tar.gz |
MFC r264400,r265836:
r264400:
NO_MAN= has been deprecated in favor of MAN= for some time, go ahead
and finish the job. ncurses is now the only Makefile in the tree that
uses it since it wasn't a simple mechanical change, and will be
addressed in a future commit.
r265836:
Remove last two NO_MAN= in the tree. In both of these cases, MAN= is
what is needed.
Diffstat (limited to 'share')
-rw-r--r-- | share/examples/FreeBSD_version/Makefile | 2 | ||||
-rw-r--r-- | share/examples/find_interface/Makefile | 2 | ||||
-rw-r--r-- | share/examples/kld/cdev/test/Makefile | 2 | ||||
-rw-r--r-- | share/examples/kld/syscall/test/Makefile | 2 | ||||
-rw-r--r-- | share/examples/libvgl/Makefile | 2 | ||||
-rw-r--r-- | share/examples/perfmon/Makefile | 2 | ||||
-rw-r--r-- | share/examples/ppi/Makefile | 2 | ||||
-rw-r--r-- | share/mk/bsd.README | 2 | ||||
-rw-r--r-- | share/mk/bsd.test.mk | 3 |
9 files changed, 9 insertions, 10 deletions
diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile index fcfc6b3..834d925 100644 --- a/share/examples/FreeBSD_version/Makefile +++ b/share/examples/FreeBSD_version/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= FreeBSD_version -NO_MAN= +MAN= install: diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile index ac6de9c..425d5d3 100644 --- a/share/examples/find_interface/Makefile +++ b/share/examples/find_interface/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= find_interface -NO_MAN= +MAN= .include <bsd.prog.mk> diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile index ad0c0fc..eebf54d 100644 --- a/share/examples/kld/cdev/test/Makefile +++ b/share/examples/kld/cdev/test/Makefile @@ -67,7 +67,7 @@ # $FreeBSD$ # PROG= testcdev -NO_MAN= +MAN= WARNS?= 5 MODSTAT= /sbin/kldstat diff --git a/share/examples/kld/syscall/test/Makefile b/share/examples/kld/syscall/test/Makefile index 09d535b..6cc6907 100644 --- a/share/examples/kld/syscall/test/Makefile +++ b/share/examples/kld/syscall/test/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= call -NO_MAN= +MAN= WARNS?= 5 .include <bsd.prog.mk> diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile index 6b4e916..f78584e 100644 --- a/share/examples/libvgl/Makefile +++ b/share/examples/libvgl/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= demo -NO_MAN= +MAN= DPADD= ${LIBVGL} LDADD= -lvgl diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile index de59b9e..51ecf4d 100644 --- a/share/examples/perfmon/Makefile +++ b/share/examples/perfmon/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= perfmon -NO_MAN= +MAN= install: diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile index 9b0d0d5..09a98cd 100644 --- a/share/examples/ppi/Makefile +++ b/share/examples/ppi/Makefile @@ -3,6 +3,6 @@ # $FreeBSD$ PROG= ppilcd -NO_MAN= +MAN= .include <bsd.prog.mk> diff --git a/share/mk/bsd.README b/share/mk/bsd.README index ba62100..9740dac 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -309,7 +309,7 @@ To build foo from foo.c with a manual page foo.2, add the line: If foo does not have a manual page at all, add the line: - NO_MAN= + MAN= If foo has multiple source files, add the line: diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk index 2021269..b204a3c 100644 --- a/share/mk/bsd.test.mk +++ b/share/mk/bsd.test.mk @@ -62,8 +62,7 @@ SUBDIR+= ${ts} # it is rare for test cases to have man pages .if !defined(MAN) -WITHOUT_MAN=yes -.export WITHOUT_MAN +MAN= .endif # tell progs.mk we might want to install things |