summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2006-11-29 17:42:28 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2006-11-29 17:42:28 +0000
commit4ed9a879106983aace0d1b525b7ecbc8ec2b130f (patch)
tree120e847d9e80a111a0e688d9b7c6ffbbca583c53
parent77107d859dd85541bc125c5a786c79c1d1ef5771 (diff)
Hook docs to the build
-rw-r--r--Makefile9
-rw-r--r--doc/Makefile7
2 files changed, 14 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 42deae2b0..674c52742 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2006/11/26 14:00:56 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2006/11/29 17:42:27 matthieu Exp $
.include <bsd.own.mk>
X11BASE?= /usr/X11R6
-SUBDIR= proto data/bitmaps lib app data/xkbdata xserver driver util
+SUBDIR= proto data/bitmaps lib app data/xkbdata xserver driver doc util
.ifndef NOFONTS
SUBDIR+= font
.endif
@@ -38,6 +38,11 @@ distrib-dirs:
fi
mtree -qdef ${.CURDIR}/etc/mtree/BSD.x11.dist \
-p ${DESTDIR}${X11BASE}/ -U
+ if [ ! -d ${DESTDIR}${X11ETC}/. ]; then \
+ ${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}${X11ETC}/; \
+ fi
+ mtree -qdef ${.CURDIR}/etc/mtree/BSD.etc-x11.dist \
+ -p ${DESTDIR}${X11ETC}/ -U
update: _SUBDIRUSE
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 000000000..3914e818d
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2006/11/29 17:42:27 matthieu Exp $
+
+SUBDIR= gl-docs xorg-docs
+
+.include <bsd.subdir.mk>
+
+build: _SUBDIRUSE