Commit 5026db03 authored by Ole Streicher's avatar Ole Streicher

Rediff patches

parent 4567f323
......@@ -7,10 +7,10 @@ Subject: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/irplib/tests/irplib_polynomial-test.c b/irplib/tests/irplib_polynomial-test.c
index c27d167..d5cdf86 100644
index cead713..8b02e90 100644
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
@@ -579,16 +579,16 @@ irplib_polynomial_test_root_all_macro(const cpl_vector * self, cpl_size nreal,
@@ -589,16 +589,16 @@ irplib_polynomial_test_root_all_macro(const cpl_vector * self, cpl_size nreal,
const double root = cpl_vector_get(roots, i);
const double residual = cpl_polynomial_eval_1d(p1d, root, NULL);
......
......@@ -9,7 +9,7 @@ This shall make the build reproducible.
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/swarp/configure.ac b/swarp/configure.ac
index 59f90f8..6c35210 100644
index 33eb120..76573bc 100644
--- a/swarp/configure.ac
+++ b/swarp/configure.ac
@@ -34,9 +34,10 @@ AC_CONFIG_SRCDIR(src/makeit.c)
......
......@@ -7,10 +7,10 @@ Subject: Set the plugin directory so that esorex and python-cpl can find it.
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 555528c..99ca3b2 100644
index 62cd934..608691b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -86,15 +86,15 @@ AC_DEFUN([VISIR_SET_PATHS],
@@ -86,7 +86,7 @@ AC_DEFUN([VISIR_SET_PATHS],
[
if test -z "$plugindir"; then
......@@ -18,18 +18,18 @@ index 555528c..99ca3b2 100644
+ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
fi
if test -z "$privatelibdir"; then
@@ -98,15 +98,15 @@ AC_DEFUN([VISIR_SET_PATHS],
fi
if test -z "$pipedocsdir"; then
- pipedocsdir='${datadir}/doc/esopipes/${PACKAGE}-${VERSION}'
+ pipedocsdir='${datadir}/doc/${PACKAGE}-${VERSION}'
fi
if test -z "$configdir"; then
- configdir='${datadir}/esopipes/${PACKAGE}-${VERSION}/config'
+ configdir='${datadir}/cpl-plugins/${PACKAGE}-${VERSION}/config'
fi
if test -z "$privatelibdir"; then
@@ -102,7 +102,7 @@ AC_DEFUN([VISIR_SET_PATHS],
- configdir='${datadir}/esopipes/${PACKAGE}-${VERSION}/config'
+ configdir='${datadir}/cpl-plugins/${PACKAGE}-${VERSION}/config'
fi
if test -z "$wkfextradir"; then
......@@ -38,7 +38,7 @@ index 555528c..99ca3b2 100644
fi
if test -z "$wkfcopydir"; then
@@ -123,7 +123,7 @@ AC_DEFUN([VISIR_SET_PATHS],
@@ -129,7 +129,7 @@ AC_DEFUN([VISIR_SET_PATHS],
# Define a preprocesor symbol for the plugin search paths
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment