Bug 16084: [QA Follow-up] Correct three occurrences of __KOHA_CONF_DIR__

This bug correctly inserts substitutions for this variable.
Four occurrences will now be changed. The line for log4perl.conf is now
correct, but the three other changes point to a location that does not
exist: /etc/koha/sites/$instance/zebradb.
That should just be: /etc/koha/zebradb.
All three cases concern the explain files.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index fc4ad04..25ac182 100644 (file)
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -82,7 +82,7 @@ __END_SRU_PUBLICSERVER__
          until we come up with a good way to make it get magically set up by
          the packaging system. If you need it, uncomment and set it up
          manually.
-    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
+    <xi:include href="/etc/koha/zebradb/explain-biblios.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>
       <explain xmlns="http://explain.z3950.org/dtd/2.0/">
@@ -151,7 +151,7 @@ __END_SRU_PUBLICSERVER__
          until we come up with a good way to make it get magically set up by
          the packaging system. If you need it, uncomment and set it up
          manually.
-    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-authorities.xml"
+    <xi:include href="/etc/koha/zebradb/explain-authorities.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude">
     <xi:fallback>
       <explain xmlns="http://explain.z3950.org/dtd/2.0/">
@@ -227,7 +227,7 @@ __START_SRU_PUBLICSERVER__
        </retrieval>
     __END_BIBLIOS_RETRIEVAL_INFO__
 
-    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
+    <xi:include href="/etc/koha/zebradb/explain-biblios.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>
       <explain xmlns="http://explain.z3950.org/dtd/2.0/">