[Pkg-octave-commit] r1521 - in octave-pkg-dev/trunk: . debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-26 23:04:03 +0000 (Wed, 26 Mar 2008)
New Revision: 1521

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Call dh_install before running the unit testing

Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-03-26 20:25:52 UTC (rev 1520)
+++ octave-pkg-dev/trunk/debian/changelog	2008-03-26 23:04:03 UTC (rev 1521)
@@ -21,6 +21,8 @@
     + Set the LD_LIBRARY_PATH envvar to the package's library directory,
       just in case the package provide a shared library needed for the
       unit testing
+    + Call dh_install to install extra files needed for the the unit
+      testing
   * octave-pkg-helper: Get information directly from file DESCRIPTION,
     no need to unpack the tarball anymore
   * README: Updated to reflect the changes above

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-26 20:25:52 UTC (rev 1520)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-26 23:04:03 UTC (rev 1521)
@@ -30,8 +30,8 @@
 pkgname = $(package:octave-%=%)
 hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
 apiversion = $(shell octave-config -p API_VERSION)
-version = $(shell octave-config -p VERSION)
-ldpath = LD_LIBRARY_PATH=$(debpkg)/usr/lib/octave/$(version)
+octlibdir = $(shell octave-config -p OCTLIBDIR)
+ldpath = LD_LIBRARY_PATH=$(debpkg)$(octlibdir)
 
 install/$(package)::
 	mkdir -p $(CURDIR)/$(debpkg)/$(mpath)	\
@@ -45,6 +45,7 @@
 		 pkg -verbose -nodeps install ."
 	rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
 	$(shrpkg)/dh/octave-pkg-helper
+	dh_install --package=$(package)
 
 	@echo Checking package...
 
@@ -55,7 +56,8 @@
 		| perl -pe 's:.*/(.*)\.m::;			\
 			 print "disp (\"[$$1]\")\ntest $$1"'	\
 		>> $$tmp ;					\
-	$(ldpath) @OCTAVE@ -q --no-init-file  $$tmp ;		\
+
+	$(ldpath) @OCTAVE@ -q --no-init-file $$tmp ;		\
 	rm -f $$tmp
 
 	@if [ -f debian/check.m ] ; then			\