make the install target more similar to what is done in the base system.

3 files changed, 24 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 12c6b84bf..f04da88ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2006/12/17 20:15:39 matthieu Exp $
+# $OpenBSD: Makefile,v 1.9 2006/12/17 20:41:36 matthieu Exp $
 .include <bsd.own.mk>
 
 X11BASE?=	/usr/X11R6
@@ -30,11 +30,11 @@ beforeinstall:
 	${MAKE} distrib-dirs
 	${MAKE} includes
 
-afterinstall: install-distrib
+afterinstall:
+	cd distrib/notes; ${MAKE} install
 	/usr/libexec/makewhatis ${DESTDIR}/usr/X11R6/man
 
-install-distrib:
-	cd distrib/notes; ${MAKE} install
+realinstall: _SUBDIRUSE
 
 release: release-clean distrib-dirs release-install dist
 
@@ -53,7 +53,6 @@ release-clean:
 		exit 255; \
 	fi
 
-
 release-install:
 	@${MAKE} install
 .if ${MACHINE} == alpha || ${MACHINE} == hp300 || ${MACHINE} == mac68k || \
@@ -88,7 +87,7 @@ distrib-dirs:
 	mtree -qdef ${.CURDIR}/etc/mtree/BSD.etc-x11.dist \
 		-p ${DESTDIR}${X11ETC}/ -U
 
-.PHONY: all build beforeinstall install afterinstall release clean cleandir
+.PHONY: all build beforeinstall install afterinstall release clean cleandir \
+	distrib-dirs
 
-.include <bsd.subdir.mk>
 .include <bsd.xorg.mk>
diff --git a/app/xdm/Makefile.bsd-wrapper b/app/xdm/Makefile.bsd-wrapper
index 637572d7b..a116402be 100644
--- a/app/xdm/Makefile.bsd-wrapper
+++ b/app/xdm/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2006/11/29 12:11:47 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2006/12/17 20:41:36 matthieu Exp $
 
 PIXMAPDIR=/etc/X11/xdm/pixmaps
 
@@ -9,7 +9,7 @@ CONFIGURE_ARGS= --enable-privsep \
 	--with-bw-pixmap=OpenBSD_1bpp.xpm \
 	--with-color-pixmap=OpenBSD_15bpp.xpm
 
-extra-install:
+afterinstall:
 	$(INSTALL) -c ${.CURDIR}/config/OpenBSD_1bpp.xpm $(DESTDIR)$(PIXMAPDIR)
 	$(INSTALL) -c ${.CURDIR}/config/OpenBSD_4bpp.xpm $(DESTDIR)$(PIXMAPDIR)
 	$(INSTALL) -c ${.CURDIR}/config/OpenBSD_8bpp.xpm $(DESTDIR)$(PIXMAPDIR)
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk
index a3e3737c0..e95413df3 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.8 2006/12/02 16:28:48 matthieu Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.9 2006/12/17 20:41:36 matthieu Exp $ -*- makefile  -*-
 #
 # Copyright © 2006 Matthieu Herrb
 #
@@ -53,7 +53,7 @@ MAKE_ENV+=	AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
 .endif
 
 .if !target(includes)
-includes:
+includes: _SUBDIRUSE
 .endif
 
 .if defined(SHARED_LIBS)
@@ -96,13 +96,20 @@ depend:
 .endif
 
 .if !target(install)
-install::
+.  if !target(beforeinstall)
+beforeinstall:
+.  endif
+.  if !target(afterinstall)
+afterinstall:
+.  endif
+.  if !target(realinstall)
+realinstall:
 	${MAKE_ENV} ${MAKE} ${_lt_libs} install
 .endif
-
-.if target(extra-install)
-install::
-	cd ${.CURDIR} && ${MAKE_ENV} ${MAKE} -f Makefile.bsd-wrapper extra-install
+install: maninstall
+maninstall: afterinstall
+afterinstall: realinstall
+realinstall: beforeinstall
 .endif
 
 .if !target(dist)
@@ -189,3 +196,5 @@ _xenocara_obj! _SUBDIRUSE
 .if !target(obj)
 obj:	_xenocara_obj
 .endif
+
+.include <bsd.subdir.mk>