--- a/open-src/doc/Makefile	Fri Aug 08 16:28:28 2008 -0700
+++ b/open-src/doc/Makefile	Fri Aug 08 16:27:37 2008 -0700
@@ -28,37 +28,27 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	08/03/25
+# @(#)Makefile	1.4	08/08/08
 #
 ###############################################################################
 
-OS_SUBDIRS = \
+OS_SUBDIRS_common = \
 	docbook-utils \
 	xorg-sgml-doctools \
 	xorg-docs
 
+OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
+OS_SUBDIRS_i386  = $(OS_SUBDIRS_common)
+
 # Need to install to proto area by default for inter-package dependencies to
 # work right.
-all: install
-
-World: clean install
+default_target: install
 
-clean: 
-	$(MAKE) $(MFLAGS) subdirs OS_TARGET=clean
-
-install:
-	$(MAKE) $(MFLAGS) subdirs OS_TARGET=install
+PWD:sh=pwd
+TOP=$(PWD)/..
 
-download:
-	$(MAKE) $(MFLAGS) subdirs OS_TARGET=download
-
-source:
-	$(MAKE) $(MFLAGS) subdirs OS_TARGET=source
+### Include common definitions
+DIRNAME="docs/"
+include $(TOP)/common/Makefile.subdirs
 
-subdirs:
-	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
-	for i in $(OS_SUBDIRS) ;\
-	do \
-	(cd $$i ; echo "## making" $(OS_TARGET) "in open-src/doc/$$i..."; \
-	$(MAKE) $(MFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" $(OS_TARGET)); \
-	done
+