--- a/bootstrap.make	2013-04-11 20:34:59.015015386 +0200
+++ b/bootstrap.make	2013-04-11 20:35:26.710082615 +0200
@@ -1,4 +1,4 @@
-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
 
 _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
 _db2omf  = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
--- a/doc/xslt/Makefile.in	2013-05-10 12:57:46.804104663 +0200
+++ b/doc/xslt/Makefile.in	2013-05-10 12:58:12.434908022 +0200
@@ -340,7 +340,7 @@
 _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
 _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
 _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
 _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
 _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
 _chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
--- a/doc/gnome-doc-make/Makefile.in	2013-05-10 12:57:46.804104663 +0200
+++ b/doc/gnome-doc-make/Makefile.in	2013-05-10 12:58:12.434908022 +0200
@@ -340,7 +340,7 @@
 _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
 _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
 _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
 _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
 _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
 _chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl