diff -Nru docbook-utils-0.6.14.orig/frontends/docbook.in docbook-utils-0.6.14/frontends/docbook.in --- docbook-utils-0.6.14.orig/frontends/docbook.in 2002-11-02 18:45:10.000000000 +0100 +++ docbook-utils-0.6.14/frontends/docbook.in 2009-01-07 01:33:15.000000000 +0100 @@ -17,20 +17,18 @@ head -n 1 | sed 's/^.*DocBook\( XML\)\? V\([0-9][\.0-9]*\).*$/\2/'` SGML_CATALOG= - for f in "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat" - do - if [ -f "$f" ] - then - SGML_CATALOG=$f - break - fi - done - if [ -z "$SGML_CATALOG" ] + if [ -f ${SGML_CATALOGS_DIR}/catalog ] then - if [ "${SGML_XML}" != "sgml" ] - then SGML_CATALOG=${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat - else SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog - fi + SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog + else + for f in "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat" + do + if [ -f "$f" ] + then + SGML_CATALOG=$f + break + fi + done fi echo "$SGML_CATALOG" ;;