[sundials] 30/76: fix sundials-config script

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository sundials.

commit f8d3bbf178c0c1a3868ac65d1e99f39c151427cf
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Date:   Mon Jul 16 15:28:13 2012 +0000

    fix sundials-config script
---
 debian/patches/series                |  1 +
 debian/patches/sundials-config.patch | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 5151045..b968b95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ makefile.patch
 #sh4.patch
 fix-format-error.patch
 octave-sundialstb.patch
+ubuntu.patch
diff --git a/debian/patches/sundials-config.patch b/debian/patches/sundials-config.patch
new file mode 100644
index 0000000..3af45be
--- /dev/null
+++ b/debian/patches/sundials-config.patch
@@ -0,0 +1,34 @@
+Index: sundials-2.5.0/bin/sundials-config.in
+===================================================================
+--- sundials-2.5.0.orig/bin/sundials-config.in	2012-04-12 02:31:04.000000000 +0200
++++ sundials-2.5.0/bin/sundials-config.in	2012-07-16 17:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! @SHELL@
++#! /bin/bash
+ # -----------------------------------------------------------------------------------
+ 
+     NAME_="sundials-config"
+@@ -65,7 +65,7 @@
+ abs_includedir=`cd "${includedir}" > /dev/null 2>&1 && pwd`;
+ abs_libdir=`cd "${libdir}" > /dev/null 2>&1 && pwd`;
+ 
+-if test $abs_includedir != /usr/include ; then
++if [ test "$abs_includedir" != "/usr/include" ] ; then
+     includes=-I$abs_includedir
+ fi
+ 
+Index: sundials-2.5.0/CMakeLists.txt
+===================================================================
+--- sundials-2.5.0.orig/CMakeLists.txt	2012-07-16 16:21:00.000000000 +0200
++++ sundials-2.5.0/CMakeLists.txt	2012-07-16 17:12:04.000000000 +0200
+@@ -516,6 +516,10 @@
+   ${PROJECT_SOURCE_DIR}/include/sundials/sundials_config.in
+   ${PROJECT_BINARY_DIR}/include/sundials/sundials_config.h
+   )
++CONFIGURE_FILE(
++  ${PROJECT_SOURCE_DIR}/bin/sundials-config.in
++  ${PROJECT_SOURCE_DIR}/bin/sundials-config
++  )
+ 
+ # Add the include directory in the source tree and the one in
+ # the binary tree (for the header file sundials_config.h)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sundials.git