From d56195c799ce3e1b0964dcc3921a3e1004d26bf8 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Mon, 3 Oct 2005 06:52:39 +0000
Subject: [PATCH] install.sh now depends on catalog.xml also

---
 releasetools/Targets.mk | 6 +++---
 releasetools/install.sh | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 786a729c7..af8913f54 100644
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -21,15 +21,15 @@ RELEASE-NOTES.pdf: RELEASE-NOTES.xml
 	echo $$uri >> .urilist; \
 	done
 
-install.sh: .CatalogManager.properties.example .urilist
-	cp $(INSTALL_SH) install.sh
-
 .make-catalog.xsl: $(MAKECATALOG)
 	cp $< $@
 
 catalog.xml: .make-catalog.xsl
 	$(XSLT) -output $@ $< $< DISTRO="$(DISTRO)"
 
+install.sh: .CatalogManager.properties.example .urilist catalog.xml
+	cp $(INSTALL_SH) install.sh
+
 distrib: all $(DISTRIB_DEPENDS) RELEASE-NOTES.txt RELEASE-NOTES.pdf $(NEWSFILE) install.sh
 
 $(NEWSFILE):
diff --git a/releasetools/install.sh b/releasetools/install.sh
index 60bc81310..26144548a 100755
--- a/releasetools/install.sh
+++ b/releasetools/install.sh
@@ -745,6 +745,14 @@ EOF
   exit
   fi
 
+  if [ ! -f "$thisXmlCatalog" ]; then
+    cat <<EOF
+
+FATAL: $thisXmlCatalog file needed but not found. Stopping.
+EOF
+  exit
+  fi
+
   if [ -z "$XML_CATALOG_FILES" ]; then
     echo
     echo "WARNING: XML_CATALOG_FILES not set. Not testing with xmlcatalog."
-- 
2.40.0