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

[Rafael Laboissiere]

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

    Remove the previous hack common-install-prehook-impl
    
    Upstream version 2.4.0 creates correctly the needed directories /usr/lib
    /usr/include, /usr/share/man/man1.  Drop this rule from debian/rules,
    accordingly.

diff --git a/debian/changelog b/debian/changelog
index 3a7d416..59ff06f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ sundials (2.4.0-1) UNRELEASED; urgency=low
     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/rules:
+    + Use DESTDIR instead of prefix when invoking make install
+    + This new upstream version creates correctly the needed directories
+      at installation time. Remove the hacked code in rule
+      common-install-prehook-impl, accordingly.
 
   * debian/control: The package is now maintained through a Git repository
     at alioth.debian.org.  Switch the Vcs-* fields accordingly.
diff --git a/debian/rules b/debian/rules
index f035d92..c35d21c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-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 DESTDIR=$(DEB_DESTDIR)
@@ -17,13 +15,6 @@ DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
 
 DEB_COMPRESS_EXCLUDE = .c .out .f
 
-# The following hack is necessary because the upstream makefiles do
-# not install $libdir and $includedir or $mandir
-common-install-prehook-impl::
-	mkdir -p $(debusr)/lib
-	mkdir -p $(debusr)/include
-	mkdir -p $(debusr)/share/man/man1
-
 get-orig-source:
 	wget -O $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
 	     https://computation.llnl.gov/casc/sundials/download/code/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz

-- 
sundials