r45253 - in /packages/sundials/trunk/debian/patches: series sundials-config.patch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Jul 16 15:28:13 2012
New Revision: 45253

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45253
Log:
fix sundials-config script

Added:
    packages/sundials/trunk/debian/patches/sundials-config.patch
Modified:
    packages/sundials/trunk/debian/patches/series

Modified: packages/sundials/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/patches/series?rev=45253&op=diff
==============================================================================
--- packages/sundials/trunk/debian/patches/series (original)
+++ packages/sundials/trunk/debian/patches/series Mon Jul 16 15:28:13 2012
@@ -3,3 +3,4 @@
 #sh4.patch
 fix-format-error.patch
 octave-sundialstb.patch
+ubuntu.patch

Added: packages/sundials/trunk/debian/patches/sundials-config.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/patches/sundials-config.patch?rev=45253&op=file
==============================================================================
--- packages/sundials/trunk/debian/patches/sundials-config.patch (added)
+++ packages/sundials/trunk/debian/patches/sundials-config.patch Mon Jul 16 15:28:13 2012
@@ -1,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)