19 files changed, 4 insertions, 2 deletions
diff --git a/giscanner/mallard-C-class.tmpl b/giscanner/doctemplates/C/mallard-C-class.tmpl
index b0f703f9..b0f703f9 100644
--- a/giscanner/mallard-C-class.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-class.tmpl
diff --git a/giscanner/mallard-C-default.tmpl b/giscanner/doctemplates/C/mallard-C-default.tmpl
index 8326343e..8326343e 100644
--- a/giscanner/mallard-C-default.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-default.tmpl
diff --git a/giscanner/mallard-C-enum.tmpl b/giscanner/doctemplates/C/mallard-C-enum.tmpl
index b59f27e6..b59f27e6 100644
--- a/giscanner/mallard-C-enum.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-enum.tmpl
diff --git a/giscanner/mallard-C-function.tmpl b/giscanner/doctemplates/C/mallard-C-function.tmpl
index 051fb0b0..051fb0b0 100644
--- a/giscanner/mallard-C-function.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-function.tmpl
diff --git a/giscanner/mallard-C-namespace.tmpl b/giscanner/doctemplates/C/mallard-C-namespace.tmpl
index 284ba238..284ba238 100644
--- a/giscanner/mallard-C-namespace.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-namespace.tmpl
diff --git a/giscanner/mallard-C-property.tmpl b/giscanner/doctemplates/C/mallard-C-property.tmpl
index a4719952..a4719952 100644
--- a/giscanner/mallard-C-property.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-property.tmpl
diff --git a/giscanner/mallard-C-record.tmpl b/giscanner/doctemplates/C/mallard-C-record.tmpl
index 1c7223a8..1c7223a8 100644
--- a/giscanner/mallard-C-record.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-record.tmpl
diff --git a/giscanner/mallard-C-signal.tmpl b/giscanner/doctemplates/C/mallard-C-signal.tmpl
index 69ecaad4..69ecaad4 100644
--- a/giscanner/mallard-C-signal.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-signal.tmpl
diff --git a/giscanner/mallard-C-vfunc.tmpl b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl
index a35c7b52..a35c7b52 100644
--- a/giscanner/mallard-C-vfunc.tmpl
+++ b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl
diff --git a/giscanner/mallard-Python-class.tmpl b/giscanner/doctemplates/Python/mallard-Python-class.tmpl
index 6edf25db..6edf25db 100644
--- a/giscanner/mallard-Python-class.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-class.tmpl
diff --git a/giscanner/mallard-Python-default.tmpl b/giscanner/doctemplates/Python/mallard-Python-default.tmpl
index 87791059..87791059 100644
--- a/giscanner/mallard-Python-default.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-default.tmpl
diff --git a/giscanner/mallard-Python-enum.tmpl b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl
index 9e44ede9..9e44ede9 100644
--- a/giscanner/mallard-Python-enum.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl
diff --git a/giscanner/mallard-Python-function.tmpl b/giscanner/doctemplates/Python/mallard-Python-function.tmpl
index 5ccc800a..5ccc800a 100644
--- a/giscanner/mallard-Python-function.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-function.tmpl
diff --git a/giscanner/mallard-Python-namespace.tmpl b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl
index 935cd440..935cd440 100644
--- a/giscanner/mallard-Python-namespace.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl
diff --git a/giscanner/mallard-Python-property.tmpl b/giscanner/doctemplates/Python/mallard-Python-property.tmpl
index 7ef72ccb..7ef72ccb 100644
--- a/giscanner/mallard-Python-property.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-property.tmpl
diff --git a/giscanner/mallard-Python-record.tmpl b/giscanner/doctemplates/Python/mallard-Python-record.tmpl
index 1b00e3be..1b00e3be 100644
--- a/giscanner/mallard-Python-record.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-record.tmpl
diff --git a/giscanner/mallard-Python-signal.tmpl b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl
index f26934fb..f26934fb 100644
--- a/giscanner/mallard-Python-signal.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl
diff --git a/giscanner/mallard-Python-vfunc.tmpl b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl
index 0c93abbc..0c93abbc 100644
--- a/giscanner/mallard-Python-vfunc.tmpl
+++ b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index c8ab67dd..801df088 100644
--- a/giscanner/mallardwriter.py
+++ b/giscanner/mallardwriter.py
@@ -413,9 +413,11 @@ class MallardWriter(object):
     def _get_template_lookup(self):
         if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
             top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR']
-            template_dir = os.path.join(top_srcdir, 'giscanner')
+            srcdir = os.path.join(top_srcdir, 'giscanner')
         else:
-            template_dir = os.path.dirname(__file__)
+            srcdir = os.path.dirname(__file__)
+
+        template_dir = os.path.join(srcdir, 'doctemplates', self._language)
 
         return TemplateLookup(directories=[template_dir],
                               module_directory=tempfile.gettempdir(),