From add863bcde142e7cb47f1b75f9b9cdc33d398ffd Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 2 Jan 2014 13:20:49 -0800
Subject: [PATCH] Make 'make check_web' work with Ubuntu 13.10 by default.

* Makefile (SGML_CATALOG_FILES): HTML4.cat moved in Ubuntu.
* NEWS: Document this.
---
 Makefile | 9 ++++-----
 NEWS     | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 3c4523d..40bbbff 100644
--- a/Makefile
+++ b/Makefile
@@ -246,14 +246,13 @@ AWK=		awk
 # is typically nicer if it works.
 KSHELL=		/bin/bash
 
-# The path where SGML DTDs are kept.
-# The default is appropriate for Ubuntu 12.10.
+# The path where SGML DTDs are kept and the catalog file(s) to use when
+# validating.  The default is appropriate for Ubuntu 13.10.
 SGML_TOPDIR= /usr
 SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
 SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
-
-# The catalog file(s) to use when validating.
-SGML_CATALOG_FILES= HTML4.cat
+SGML_CATALOG_FILES= \
+  $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat
 
 # The name, arguments and environment of a program to validate your web pages.
 # See <http://www.jclark.com/sp/> for a validator, and
diff --git a/NEWS b/NEWS
index 4d4f244..310595e 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,10 @@ Unreleased, experimental changes
     A uninitialized-storage bug in 'localtime' has been fixed.
     (Thanks to Logan Chien.)
 
+  Changes affecting the build procedure
+
+    The settings for 'make check_web' now default to Ubuntu 13.10.
+
   Changes affecting commentary
 
     The boundary of the US Pacific time zone is given more accurately.