summaryrefslogtreecommitdiff
path: root/usr/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd')
-rw-r--r--usr/src/cmd/Makefile14
-rw-r--r--usr/src/cmd/mandoc/config.h4
2 files changed, 4 insertions, 14 deletions
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile
index 37e979d619..9a081848fc 100644
--- a/usr/src/cmd/Makefile
+++ b/usr/src/cmd/Makefile
@@ -56,7 +56,6 @@ COMMON_SUBDIRS= \
allocate \
availdevs \
lp \
- perl \
Adm \
abi \
adbgen \
@@ -191,7 +190,6 @@ COMMON_SUBDIRS= \
growfs \
grpck \
gss \
- hal \
halt \
head \
hostid \
@@ -228,7 +226,6 @@ COMMON_SUBDIRS= \
kvmstat \
last \
lastcomm \
- latencytop \
ldap \
ldapcachemgr \
lgrpinfo \
@@ -307,7 +304,6 @@ COMMON_SUBDIRS= \
pgrep \
picl \
plimit \
- policykit \
pools \
power \
powertop \
@@ -345,10 +341,7 @@ COMMON_SUBDIRS= \
renice \
rm \
rmdir \
- rmformat \
- rmmount \
rmt \
- rmvolmgr \
roles \
rpcbind \
rpcgen \
@@ -438,8 +431,6 @@ COMMON_SUBDIRS= \
valtools \
vgrind \
vi \
- volcheck \
- volrmmount \
vrrpadm \
vscan \
vt \
@@ -668,9 +659,6 @@ MSGSUBDIRS= \
roles \
rm \
rmdir \
- rmformat \
- rmmount \
- rmvolmgr \
sasinfo \
sbdadm \
scadm \
@@ -716,8 +704,6 @@ MSGSUBDIRS= \
valtools \
vgrind \
vi \
- volcheck \
- volrmmount \
vrrpadm \
vscan \
w \
diff --git a/usr/src/cmd/mandoc/config.h b/usr/src/cmd/mandoc/config.h
index 75f62a9339..5f66e96f82 100644
--- a/usr/src/cmd/mandoc/config.h
+++ b/usr/src/cmd/mandoc/config.h
@@ -2,12 +2,16 @@
#define MANDOC_CONFIG_H
#include <sys/types.h>
+#include <fcntl.h> /* XXX so that O_DIRECTORY is already defined */
#define MAN_CONF_FILE "/etc/man.conf"
#define MANPATH_BASE "/usr/share/man"
#define MANPATH_DEFAULT "/usr/share/man:/usr/gnu/share/man"
#define UTF8_LOCALE "en_US.UTF-8"
#define EFTYPE EINVAL
+#ifdef O_DIRECTORY
+#undef O_DIRECTORY
+#endif
#define O_DIRECTORY 0
#define HAVE_CMSG_XPG42 0
#define HAVE_DIRENT_NAMLEN 0