install.sh now depends on catalog.xml also

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 786a729c7713df22e0e87c2653fd7a85094be01e..af8913f547b49762cdb270a84de6a3f0080699b5 100644 (file)
--- 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 60bc81310212ba7a3ca13dd3b100c327e6a8fd31..26144548a5e620701b119c478f4313848b58cbea 100755 (executable)
--- 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."