[Pkg-scicomp-commits] [SCM] sundials branch, master, updated. 0c77df68fa457bd3bf29c76460554af67a8c60f6

Rafael Laboissiere rafael at debian.org
Sun May 31 10:30:45 UTC 2009 

The following commit has been merged in the master branch:
commit a0e999665769c5f7bfae71988f983722dd4d266a
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun May 31 10:18:20 2009 +0200

    New patch for using DESTDIR in make install
    
    This patch allow the use DESTDIR for installing files in all
    src/*/Makefile.in files.  This is necessary, otherwise the installed *.la
    files would contain a wrong value in the libdir variable.
    
    Also, in debian/rules use DESTDIR instead of prefix when invoking make
    install.

diff --git a/debian/changelog b/debian/changelog
index 58a3ec5..3a7d416 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ sundials (2.4.0-1) UNRELEASED; urgency=low
 
   * New upstream release
   * debian/patches/modern-ltmain.sh.patch: Drop patch (applied upstream)
+  * debian/patches/allow-destdir.diff: New patch for using the DESTDIR
+    prefix for installing files in all src/*/Makefile.in files.  This is
+    necessary, otherwise the installed *.la files would contain a wrong
+    value in the libdir variable.
+  * debian/rules: Use DESTDIR instead of prefix when invoking make install
 
   * debian/control: The package is now maintained through a Git repository
     at alioth.debian.org.  Switch the Vcs-* fields accordingly.
diff --git a/debian/patches/allow-destdir.diff b/debian/patches/allow-destdir.diff
new file mode 100644
index 0000000..42feed1
--- /dev/null
+++ b/debian/patches/allow-destdir.diff
@@ -0,0 +1,237 @@
+Use the DESTDIR prefix for installing files in all src/*/Makefile.in
+files.  This is necessary, otherwise the installed *.la files would
+contain a wrong value in the libdir variable.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 31 May 2009 10:10:24 +0200
+
+--- a/src/cvode/Makefile.in
++++ b/src/cvode/Makefile.in
+@@ -91,23 +91,23 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODE_LIB) $(CVODE_LIB_FILES)  $(CVODE_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(CVODE_LIB)
+-	$(mkinstalldirs) $(includedir)/cvode
+-	$(mkinstalldirs) $(libdir)
+-	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(CVODE_LIB) $(libdir)
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode.h         $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_direct.h  $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_dense.h   $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_band.h    $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_diag.h    $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_spils.h   $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_spbcgs.h  $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_spgmr.h   $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_sptfqmr.h $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_bandpre.h $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_bbdpre.h  $(includedir)/cvode/
+-	$(INSTALL_HEADER) $(top_srcdir)/src/cvode/cvode_impl.h        $(includedir)/cvode/
++	$(mkinstalldirs) $(DESTDIR)$(includedir)/cvode
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(CVODE_LIB) $(DESTDIR)$(libdir)
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode.h         $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_direct.h  $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_dense.h   $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_band.h    $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_diag.h    $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_spils.h   $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_spbcgs.h  $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_spgmr.h   $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_sptfqmr.h $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_bandpre.h $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_bbdpre.h  $(DESTDIR)$(includedir)/cvode/
++	$(INSTALL_HEADER) $(top_srcdir)/src/cvode/cvode_impl.h        $(DESTDIR)$(includedir)/cvode/
+ 	@if test "X${LAPACK_ENABLED}" = "Xyes"; then \
+-	  $(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_lapack.h  $(includedir)/cvode/ ; \
++	  $(INSTALL_HEADER) $(top_srcdir)/include/cvode/cvode_lapack.h  $(DESTDIR)$(includedir)/cvode/ ; \
+ 	fi
+ 
+ uninstall:
+--- a/src/cvodes/Makefile.in
++++ b/src/cvodes/Makefile.in
+@@ -91,23 +91,23 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODES_LIB) $(CVODES_LIB_FILES) $(CVODES_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(CVODES_LIB)
+-	$(mkinstalldirs) $(includedir)/cvodes
+-	$(mkinstalldirs) $(libdir)
+-	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(CVODES_LIB) $(libdir)
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes.h         $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_direct.h  $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_dense.h   $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_band.h    $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_diag.h    $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_spils.h   $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_spbcgs.h  $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_spgmr.h   $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_sptfqmr.h $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_bandpre.h $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_bbdpre.h  $(includedir)/cvodes/
+-	$(INSTALL_HEADER) $(top_srcdir)/src/cvodes/cvodes_impl.h        $(includedir)/cvodes/
++	$(mkinstalldirs) $(DESTDIR)$(includedir)/cvodes
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(CVODES_LIB) $(DESTDIR)$(libdir)
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes.h         $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_direct.h  $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_dense.h   $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_band.h    $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_diag.h    $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_spils.h   $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_spbcgs.h  $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_spgmr.h   $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_sptfqmr.h $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_bandpre.h $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_bbdpre.h  $(DESTDIR)$(includedir)/cvodes/
++	$(INSTALL_HEADER) $(top_srcdir)/src/cvodes/cvodes_impl.h        $(DESTDIR)$(includedir)/cvodes/
+ 	@if test "X${LAPACK_ENABLED}" = "Xyes"; then \
+-	  $(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_lapack.h  $(includedir)/cvodes/ ; \
++	  $(INSTALL_HEADER) $(top_srcdir)/include/cvodes/cvodes_lapack.h  $(DESTDIR)$(includedir)/cvodes/ ; \
+ 	fi
+ 
+ uninstall:
+--- a/src/ida/Makefile.in
++++ b/src/ida/Makefile.in
+@@ -91,21 +91,21 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDA_LIB) $(IDA_LIB_FILES) $(IDA_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(IDA_LIB)
+-	$(mkinstalldirs) $(includedir)/ida
+-	$(mkinstalldirs) $(libdir)
+-	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(IDA_LIB) $(libdir)
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida.h         $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_direct.h  $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_dense.h   $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_band.h    $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_spbcgs.h  $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_spgmr.h   $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_sptfqmr.h $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_bbdpre.h  $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_spils.h   $(includedir)/ida/
+-	$(INSTALL_HEADER) $(top_srcdir)/src/ida/ida_impl.h        $(includedir)/ida/
++	$(mkinstalldirs) $(DESTDIR)$(includedir)/ida
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(IDA_LIB) $(DESTDIR)$(libdir)
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida.h         $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_direct.h  $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_dense.h   $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_band.h    $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_spbcgs.h  $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_spgmr.h   $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_sptfqmr.h $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_bbdpre.h  $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_spils.h   $(DESTDIR)$(includedir)/ida/
++	$(INSTALL_HEADER) $(top_srcdir)/src/ida/ida_impl.h        $(DESTDIR)$(includedir)/ida/
+ 	@if test "X${LAPACK_ENABLED}" = "Xyes"; then \
+-	  $(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_lapack.h  $(includedir)/ida/ ; \
++	  $(INSTALL_HEADER) $(top_srcdir)/include/ida/ida_lapack.h  $(DESTDIR)$(includedir)/ida/ ; \
+ 	fi
+ 
+ uninstall:
+--- a/src/idas/Makefile.in
++++ b/src/idas/Makefile.in
+@@ -91,21 +91,21 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDAS_LIB) $(IDAS_LIB_FILES) $(IDAS_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(IDAS_LIB)
+-	$(mkinstalldirs) $(includedir)/idas
+-	$(mkinstalldirs) $(libdir)
+-	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(IDAS_LIB) $(libdir)
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas.h         $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_direct.h  $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_dense.h   $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_band.h    $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_spbcgs.h  $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_spgmr.h   $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_sptfqmr.h $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_bbdpre.h  $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_spils.h   $(includedir)/idas/
+-	$(INSTALL_HEADER) $(top_srcdir)/src/idas/idas_impl.h        $(includedir)/idas/
++	$(mkinstalldirs) $(DESTDIR)$(includedir)/idas
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(IDAS_LIB) $(DESTDIR)$(libdir)
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas.h         $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_direct.h  $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_dense.h   $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_band.h    $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_spbcgs.h  $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_spgmr.h   $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_sptfqmr.h $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_bbdpre.h  $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_spils.h   $(DESTDIR)$(includedir)/idas/
++	$(INSTALL_HEADER) $(top_srcdir)/src/idas/idas_impl.h        $(DESTDIR)$(includedir)/idas/
+ 	@if test "X${LAPACK_ENABLED}" = "Xyes"; then \
+-	  $(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_lapack.h  $(includedir)/idas/ ; \
++	  $(INSTALL_HEADER) $(top_srcdir)/include/idas/idas_lapack.h  $(DESTDIR)$(includedir)/idas/ ; \
+ 	fi
+ 
+ uninstall:
+--- a/src/kinsol/Makefile.in
++++ b/src/kinsol/Makefile.in
+@@ -91,21 +91,21 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(KINSOL_LIB) $(KINSOL_LIB_FILES) $(KINSOL_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(KINSOL_LIB)
+-	$(mkinstalldirs) $(includedir)/kinsol
+-	$(mkinstalldirs) $(libdir)
+-	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(KINSOL_LIB) $(libdir)
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol.h         $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_direct.h  $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_dense.h   $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_band.h    $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_spgmr.h   $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_spbcgs.h  $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_sptfqmr.h $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_bbdpre.h  $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_spils.h   $(includedir)/kinsol/
+-	$(INSTALL_HEADER) $(top_srcdir)/src/kinsol/kinsol_impl.h        $(includedir)/kinsol/
++	$(mkinstalldirs) $(DESTDIR)$(includedir)/kinsol
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(KINSOL_LIB) $(DESTDIR)$(libdir)
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol.h         $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_direct.h  $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_dense.h   $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_band.h    $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_spgmr.h   $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_spbcgs.h  $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_sptfqmr.h $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_bbdpre.h  $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_spils.h   $(DESTDIR)$(includedir)/kinsol/
++	$(INSTALL_HEADER) $(top_srcdir)/src/kinsol/kinsol_impl.h        $(DESTDIR)$(includedir)/kinsol/
+ 	@if test "X${LAPACK_ENABLED}" = "Xyes"; then \
+-	  $(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_lapack.h  $(includedir)/kinsol/ ; \
++	  $(INSTALL_HEADER) $(top_srcdir)/include/kinsol/kinsol_lapack.h  $(DESTDIR)$(includedir)/kinsol/ ; \
+ 	fi
+ 
+ uninstall:
+--- a/src/nvec_ser/Makefile.in
++++ b/src/nvec_ser/Makefile.in
+@@ -72,10 +72,10 @@
+ 	fi
+ 
+ install: $(NVECSER_LIB) $(FNVECSER_LIB)
+-	$(mkinstalldirs) $(includedir)/nvector
+-	$(mkinstalldirs) $(libdir)
+-	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(NVECSER_LIB) $(libdir)
+-	$(INSTALL_HEADER) $(top_srcdir)/include/nvector/nvector_serial.h $(includedir)/nvector/
++	$(mkinstalldirs) $(DESTDIR)$(includedir)/nvector
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL_LIB) $(NVECSER_LIB) $(DESTDIR)$(libdir)
++	$(INSTALL_HEADER) $(top_srcdir)/include/nvector/nvector_serial.h $(DESTDIR)$(includedir)/nvector/
+ 	@if test "X${FCMIX_ENABLED}" = "Xyes"; then                                    \
+ 	   echo "${LIBTOOL} --mode=install ${INSTALL_LIB} ${FNVECSER_LIB} ${libdir}" ; \
+ 	   ${LIBTOOL} --mode=install ${INSTALL_LIB} ${FNVECSER_LIB} ${libdir} ;        \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -58,10 +58,10 @@
+ 	 done
+ 
+ install:
+-	$(mkinstalldirs) $(bindir)
+-	$(INSTALL_PROG)  $(top_builddir)/bin/sundials-config    $(bindir)/
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	$(INSTALL_PROG)  $(top_builddir)/bin/sundials-config    $(DESTDIR)$(bindir)/
+ 	@if test -f $(top_builddir)/bin/fortran-update.sh ; then              \
+-	  $(INSTALL_PROG)  $(top_builddir)/bin/fortran-update.sh  $(bindir)/ ;\
++	  $(INSTALL_PROG)  $(top_builddir)/bin/fortran-update.sh  $(DESTDIR)$(bindir)/ ;\
+ 	fi
+ 	@for i in ${SLV_MODULES} ; do                                         \
+ 	   if test -d $${i} ; then                                            \
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..a63a234 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+allow-destdir.diff
diff --git a/debian/rules b/debian/rules
index 3e28256..f035d92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ debusr := $(DEB_DESTDIR)usr
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --disable-mpi --enable-examples
 DEB_CONFIGURE_SCRIPT_ENV += F77="gfortran"
-DEB_MAKE_INSTALL_TARGET := install prefix=$(debusr)
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(DEB_DESTDIR)
 
 DEB_INSTALL_MANPAGES_libsundials-serial-dev := debian/sundials-config.1
 DEB_INSTALL_EXAMPLES_libsundials-serial-dev := examples/*

-- 
sundials

More information about the Pkg-scicomp-commits mailing list