summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-04-25 19:25:05 +0000
committerimp <imp@FreeBSD.org>2014-04-25 19:25:05 +0000
commite27daff3c91f2ac226caaef0895f62c97a510350 (patch)
tree507607299f55a4837c07a391c777486effd7515c
parentb9b324eac516693026e712ed0319e678b9599f29 (diff)
downloadFreeBSD-src-e27daff3c91f2ac226caaef0895f62c97a510350.zip
FreeBSD-src-e27daff3c91f2ac226caaef0895f62c97a510350.tar.gz
Eliminate last vestigies of NO_MAN= in the tree. Also, remove
ineffectual NOMAN= lines. These don't change the build at all.
-rw-r--r--lib/ncurses/ncurses/Makefile3
-rw-r--r--sys/boot/amd64/boot1.efi/Makefile2
-rw-r--r--tools/tools/ath/arcode/Makefile2
-rw-r--r--tools/tools/ath/ath_ee_9287_print/Makefile1
-rw-r--r--tools/tools/ath/ath_ee_9300_print/Makefile1
-rw-r--r--tools/tools/ath/ath_ee_v14_print/Makefile1
-rw-r--r--tools/tools/ath/ath_ee_v4k_print/Makefile1
-rw-r--r--tools/tools/ath/athalq/Makefile2
-rw-r--r--usr.bin/svn/lib/libapr/Makefile2
-rw-r--r--usr.bin/svn/lib/libserf/Makefile2
-rw-r--r--usr.bin/svn/lib/libsqlite3/Makefile2
11 files changed, 5 insertions, 14 deletions
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index e674cf2..52cf064 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -3,7 +3,8 @@
SHLIBDIR?= /lib
.if !defined(ENABLE_WIDEC)
-NO_MAN=
+# Override any MAN= setting below..
+MK_MAN=no
.endif
.include <bsd.own.mk>
diff --git a/sys/boot/amd64/boot1.efi/Makefile b/sys/boot/amd64/boot1.efi/Makefile
index ca23116..55752a2 100644
--- a/sys/boot/amd64/boot1.efi/Makefile
+++ b/sys/boot/amd64/boot1.efi/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
diff --git a/tools/tools/ath/arcode/Makefile b/tools/tools/ath/arcode/Makefile
index 9611a6f..b18fad4 100644
--- a/tools/tools/ath/arcode/Makefile
+++ b/tools/tools/ath/arcode/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= arcode
-NOMAN= yes
+MAN=
.include <../Makefile.inc>
diff --git a/tools/tools/ath/ath_ee_9287_print/Makefile b/tools/tools/ath/ath_ee_9287_print/Makefile
index 00b6316..e6765c4 100644
--- a/tools/tools/ath/ath_ee_9287_print/Makefile
+++ b/tools/tools/ath/ath_ee_9287_print/Makefile
@@ -4,7 +4,6 @@
PROG= ath_ee_9287_print
SRCS= main.c eeprom.c 9287.c
-NOMAN= yes
MAN=
.include <../Makefile.inc>
diff --git a/tools/tools/ath/ath_ee_9300_print/Makefile b/tools/tools/ath/ath_ee_9300_print/Makefile
index 797f632..efb73d2 100644
--- a/tools/tools/ath/ath_ee_9300_print/Makefile
+++ b/tools/tools/ath/ath_ee_9300_print/Makefile
@@ -3,7 +3,6 @@
.PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal
PROG= ath_ee_9300_print
-NOMAN= yes
MAN=
SRCS= main.c
SRCS+= opt_ah.h
diff --git a/tools/tools/ath/ath_ee_v14_print/Makefile b/tools/tools/ath/ath_ee_v14_print/Makefile
index d126c5e..34e8778 100644
--- a/tools/tools/ath/ath_ee_v14_print/Makefile
+++ b/tools/tools/ath/ath_ee_v14_print/Makefile
@@ -3,7 +3,6 @@
.PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal
PROG= ath_ee_v14_print
-NOMAN= yes
MAN=
.include <../Makefile.inc>
diff --git a/tools/tools/ath/ath_ee_v4k_print/Makefile b/tools/tools/ath/ath_ee_v4k_print/Makefile
index 7bd737f..89e4156 100644
--- a/tools/tools/ath/ath_ee_v4k_print/Makefile
+++ b/tools/tools/ath/ath_ee_v4k_print/Makefile
@@ -4,7 +4,6 @@
PROG= ath_ee_v4k_print
SRCS= main.c eeprom.c v4k.c
-NOMAN= yes
MAN=
.include <../Makefile.inc>
diff --git a/tools/tools/ath/athalq/Makefile b/tools/tools/ath/athalq/Makefile
index a7eb394..7370b7a 100644
--- a/tools/tools/ath/athalq/Makefile
+++ b/tools/tools/ath/athalq/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= athalq
-NOMAN= yes
+MAN=
CFLAGS+= -I../../../../sys/contrib
diff --git a/usr.bin/svn/lib/libapr/Makefile b/usr.bin/svn/lib/libapr/Makefile
index 81f7e43..4504125 100644
--- a/usr.bin/svn/lib/libapr/Makefile
+++ b/usr.bin/svn/lib/libapr/Makefile
@@ -20,8 +20,6 @@ SRCS= apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c \
thread_mutex.c thread_rwlock.c threadpriv.c time.c \
timestr.c userinfo.c version.c waitio.c
-NOMAN= internalonly
-
.PATH: ${APR}/atomic/unix ${APR}/dso/unix ${APR}/file_io/unix \
${APR}/locks/unix ${APR}/memory/unix ${APR}/misc/unix \
${APR}/mmap/unix ${APR}/network_io/unix ${APR}/passwd \
diff --git a/usr.bin/svn/lib/libserf/Makefile b/usr.bin/svn/lib/libserf/Makefile
index fa79cf3..f8d618f 100644
--- a/usr.bin/svn/lib/libserf/Makefile
+++ b/usr.bin/svn/lib/libserf/Makefile
@@ -14,8 +14,6 @@ SRCS= aggregate_buckets.c allocator.c auth.c auth_basic.c \
response_body_buckets.c response_buckets.c simple_buckets.c \
socket_buckets.c ssl_buckets.c ssltunnel.c
-NOMAN= internalonly
-
.PATH: ${SERF}/buckets ${SERF}/auth ${SERF}
CFLAGS+= -I${.CURDIR} -I${SERF} \
diff --git a/usr.bin/svn/lib/libsqlite3/Makefile b/usr.bin/svn/lib/libsqlite3/Makefile
index 49b6d1d..15a2d00 100644
--- a/usr.bin/svn/lib/libsqlite3/Makefile
+++ b/usr.bin/svn/lib/libsqlite3/Makefile
@@ -7,8 +7,6 @@ LIB= sqlite3
SRCS= sqlite3.c
-NOMAN= internalonly
-
.PATH: ${SQLITE}
CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} \
OpenPOWER on IntegriCloud