From: Ole Streicher <olebole@debian.org>
Date: Wed, 12 Oct 2016 10:04:37 +0200
Subject: Set the plugin directory so that esorex and python-cpl can find it.

---
 acinclude.m4 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 950afb5..4f0f9b8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -84,15 +84,15 @@ AC_DEFUN([KMOS_SET_VERSION_INFO],
 AC_DEFUN([KMOS_SET_PATHS],
 [
     if test -z "$plugindir"; then
-        plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
+        plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
     fi
 
     if test -z "$pipedocsdir"; then
-        pipedocsdir='${datadir}/doc/esopipes/${PACKAGE}-${VERSION}/'
+        pipedocsdir='${datadir}/doc/cpl-plugin-${PACKAGE}-${VERSION}/'
     fi
 
     if test -z "$apidocdir"; then
-        apidocdir='${datadir}/doc/esopipes/${PACKAGE}-${VERSION}/html'
+        apidocdir='${datadir}/doc/cpl-plugin-${PACKAGE}-${VERSION}/html'
     fi
 
     if test -z "$privatelibdir"; then
@@ -104,7 +104,7 @@ AC_DEFUN([KMOS_SET_PATHS],
     fi
 
     if test -z "$wkfextradir"; then
-        wkfextradir='${datadir}/esopipes/${PACKAGE}-${VERSION}/reflex'
+        wkfextradir='${datadir}/cpl-plugins/${PACKAGE}-${VERSION}/reflex'
     fi
 
     if test -z "$wkfcopydir"; then
@@ -122,7 +122,7 @@ AC_DEFUN([KMOS_SET_PATHS],
 
     # Define a preprocesor symbol for the plugin search paths
 
-    AC_DEFINE_UNQUOTED(KMOS_PLUGIN_DIR, "esopipes-plugins",
+    AC_DEFINE_UNQUOTED(KMOS_PLUGIN_DIR, "cpl/plugins",
                        [Plugin directory tree prefix])
 
     eval plugin_dir="$plugindir"