[xml/sgml-commit] [SCM] linuxdoc-tools package for Debian. branch, master, updated. debian/0.9.60-24-gf1f1363

[Agustin Martin Domingo]

The following commit has been merged in the master branch:
commit d81aef263c8af7241ac70ab7cdb8dcf44490e9e0
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Mon May 4 22:35:15 2009 +0200

    Rewrite sgml2{info,latex,txt} parsers to allow different program locations.

diff --git a/debian/addition/sgml2info b/debian/addition/sgml2info
index 6210234..fc5640e 100644
--- a/debian/addition/sgml2info
+++ b/debian/addition/sgml2info
@@ -1,7 +1,8 @@
 #!/bin/sh
-if [ ! -x /usr/bin/makeinfo ]
-  then
+
+if which makeinfo > /dev/null 2>&1; then
+    exec /usr/bin/linuxdoc --backend=info "$@"
+else
     echo "Please install makeinfo to use LinuxDoc DTD SGML Info Conversion"
     exit 1
 fi
-exec /usr/bin/linuxdoc --backend=info "$@"
diff --git a/debian/addition/sgml2latex b/debian/addition/sgml2latex
index 1b2edc6..b6493f2 100644
--- a/debian/addition/sgml2latex
+++ b/debian/addition/sgml2latex
@@ -1,7 +1,8 @@
 #!/bin/sh
-if [ ! -x /usr/bin/latex ]
-  then
+
+if which latex > /dev/null 2>&1; then
+    exec /usr/bin/linuxdoc --backend=latex "$@"
+else
     echo "Please install latex to use LinuxDoc DTD SGML LaTeX/PS/PDF Conversion"
     exit 1
 fi
-exec /usr/bin/linuxdoc --backend=latex "$@"
diff --git a/debian/addition/sgml2txt b/debian/addition/sgml2txt
index 8c27de8..b413e3e 100644
--- a/debian/addition/sgml2txt
+++ b/debian/addition/sgml2txt
@@ -1,7 +1,8 @@
 #!/bin/sh
-if [ ! -x /usr/bin/groff ]
-  then
+
+if which groff > /dev/null 2>&1; then
+    exec /usr/bin/linuxdoc --backend=txt "$@"
+else
     echo "Please install groff to use LinuxDoc DTD SGML Text Conversion"
     exit 1
 fi
-exec /usr/bin/linuxdoc --backend=txt "$@"

-- 
linuxdoc-tools package for Debian.