- Include command macros

- Drop some obsolete SGML constructs

share/mk/web.site.mk

@@ -11,6 +11,8 @@
 # clean -- remove anything generated by processing
 #
 
+.include "doc.commands.mk"
+
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
@@ -94,32 +96,6 @@ NO_SUBDIR=	YES
 .include "${DOC_PREFIX}/share/mk/doc.common.mk"
 .include "${DOC_PREFIX}/share/mk/doc.xml.mk"
 
-_INCLIST=	navibar.ent \
-		navibar.l10n.ent \
-		common.ent \
-		header.ent \
-		header.l10n.ent \
-		iso8879.ent \
-		l10n.ent \
-		release.ent
-_SGML_INCLUDES=	${SGML_INCLUDES}
-
-.for F in ${_INCLIST}
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/${LANGCODE}/share/xml/${F}
-.endif
-.if exists(${DOC_PREFIX}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/share/xml/${F}
-.endif
-.endfor
-
-CATALOG?=	${PREFIX}/share/xml/html/catalog \
-		${PREFIX}/share/xml/catalog
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/catalog)
-CATALOG+=	${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
-.endif
-CATALOG+=	${DOC_PREFIX}/share/xml/catalog
-
 ##################################################################
 # Transformation rules