[Pkg-scicomp-commits] [SCM] sundials branch, master, updated. 174ff05588dc5c1c662fc78a5cb097cd5fa74b12

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 0e7b25750cc0da20fc1ad748aeabc02c91f14d8d
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Tue Jun 2 16:41:18 2009 +0200

    Also use DESTDIR in src/sundials/Makefile.in

diff --git a/debian/patches/allow-destdir.diff b/debian/patches/allow-destdir.diff
index 42feed1..762f0bb 100644
--- a/debian/patches/allow-destdir.diff
+++ b/debian/patches/allow-destdir.diff
@@ -235,3 +235,41 @@ contain a wrong value in the libdir variable.
  	fi
  	@for i in ${SLV_MODULES} ; do                                         \
  	   if test -d $${i} ; then                                            \
+--- a/src/sundials/Makefile.in
++++ b/src/sundials/Makefile.in
+@@ -70,21 +70,21 @@
+ lib_with_bl: $(SHARED_LIB_FILES)
+ 
+ install:
+-	$(mkinstalldirs)  $(includedir)/sundials
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_direct.h     $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_band.h       $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_dense.h      $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_iterative.h  $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_spgmr.h      $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_spbcgs.h     $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_sptfqmr.h    $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_math.h       $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_types.h      $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_nvector.h    $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_fnvector.h   $(includedir)/sundials/
+-	$(INSTALL_HEADER) $(top_builddir)/include/sundials/sundials_config.h   $(includedir)/sundials/
++	$(mkinstalldirs)  $(DESTDIR)$(includedir)/sundials
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_direct.h     $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_band.h       $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_dense.h      $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_iterative.h  $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_spgmr.h      $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_spbcgs.h     $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_sptfqmr.h    $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_math.h       $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_types.h      $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_nvector.h    $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_fnvector.h   $(DESTDIR)$(includedir)/sundials/
++	$(INSTALL_HEADER) $(top_builddir)/include/sundials/sundials_config.h   $(DESTDIR)$(includedir)/sundials/
+ 	@if test "X${LAPACK_ENABLED}" = "Xyes"; then \
+-	  $(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_lapack.h     $(includedir)/sundials/ ; \
++	  $(INSTALL_HEADER) $(top_srcdir)/include/sundials/sundials_lapack.h     $(DESTDIR)$(includedir)/sundials/ ; \
+ 	fi
+ 
+ uninstall:

-- 
sundials