Index: head/en_US.ISO8859-1/htdocs/doc/Makefile
===================================================================
--- head/en_US.ISO8859-1/htdocs/doc/Makefile	(revision 51075)
+++ head/en_US.ISO8859-1/htdocs/doc/Makefile	(revision 51076)
@@ -1,55 +1,42 @@
 #
 # $FreeBSD$
 #
 # Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install all-pgpkeyring
+_DOC_FORMATS?=	html-split html
 
+all: all-all all-pgpkeyring
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
+
 all-pgpkeyring:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/share/pgpkeys; \
-		${MAKE} \
-			pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
 
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(install)
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/share/pgpkeys; \
-		${MAKE} \
-			pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt
-.endif
-.if make(clean)
-	${RM} -rf en* handbook faq pgpkeyring.txt
-.endif
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
 
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install
+	${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
 
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}