- Fixed type in error message

* xslt/docbook/omf/db2omf.xsl:
- Fixed type in error message

* tools/gnome-doc-utils.make:\
- Don't unilaterally stick `pwd` onto $(_DOC_OMF_IN) [#169324]

* tools/gnome-doc-tool.in:
- Removed an echo I'd left in from testing

svn path=/trunk/; revision=883

2 files changed, 2 insertions, 3 deletions

diff --git a/tools/gnome-doc-tool.in b/tools/gnome-doc-tool.in
index 5bd13b6..6c00a37 100755
--- a/tools/gnome-doc-tool.in
+++ b/tools/gnome-doc-tool.in
@@ -108,7 +108,6 @@ function DO_html {
     ';
     options=`getopt -qn$progname $longopts -- c:d:e:o:nvVh "$@"`
     if [ "$?" != "0" ]; then print_help_html 1>&2; exit 1; fi
-    echo "$options"
     eval set -- "$options";
     while [ "$1" != "--" ]; do
 	case "$1" in
diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make
index eca7108..c1964ab 100644
--- a/tools/gnome-doc-utils.make
+++ b/tools/gnome-doc-utils.make
@@ -145,13 +145,13 @@ db2omf_args =									\
 	--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2)))	\
 	--stringparam db2omf.omf_dir "$(OMF_DIR)"				\
 	--stringparam db2omf.help_dir "$(HELP_DIR)"				\
-	--stringparam db2omf.omf_in "`pwd`/$(_DOC_OMF_IN)"			\
+	--stringparam db2omf.omf_in "$(_DOC_OMF_IN)"				\
 	--stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)"		\
 	$(_db2omf) $(2)
 
 ## @ _DOC_OMF_IN
 ## The OMF input file
-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(srcdir)/$(DOC_MODULE).omf.in))
+_DOC_OMF_IN = $(if $(DOC_MODULE),$(abspath $(wildcard $(srcdir)/$(DOC_MODULE).omf.in)))
 
 ## @ _DOC_OMF_DB
 ## The OMF files for DocBook output