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

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-26 20:25:52 +0000 (Wed, 26 Mar 2008)
New Revision: 1520

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
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

Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-03-26 15:06:54 UTC (rev 1519)
+++ octave-pkg-dev/trunk/debian/changelog	2008-03-26 20:25:52 UTC (rev 1520)
@@ -18,12 +18,15 @@
       tarball now.
     + Added a clean rule
     + Drop the setting of the DEB_TARBALL variable, which is obsolete now
+    + 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
   * octave-pkg-helper: Get information directly from file DESCRIPTION,
     no need to unpack the tarball anymore
   * README: Updated to reflect the changes above
   * debian/control: Drop dependency on curl
 
- -- Rafael Laboissiere <rafael at debian.org>  Wed, 26 Mar 2008 14:12:40 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 26 Mar 2008 21:25:23 +0100
 
 octave-pkg-dev (0.4) unstable; urgency=low
 

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-26 15:06:54 UTC (rev 1519)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-26 20:25:52 UTC (rev 1520)
@@ -30,6 +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)
 
 install/$(package)::
 	mkdir -p $(CURDIR)/$(debpkg)/$(mpath)	\
@@ -53,11 +55,11 @@
 		| perl -pe 's:.*/(.*)\.m::;			\
 			 print "disp (\"[$$1]\")\ntest $$1"'	\
 		>> $$tmp ;					\
-	@OCTAVE@ -q --no-init-file  $$tmp ;			\
+	$(ldpath) @OCTAVE@ -q --no-init-file  $$tmp ;		\
 	rm -f $$tmp
 
 	@if [ -f debian/check.m ] ; then			\
-		@OCTAVE@ -q --no-init-file --eval		\
+		$(ldpath) @OCTAVE@ -q --no-init-file --eval	\
 			"addpath (genpath ([pwd(),'/debian']));	\
 			 source ('debian/check.m');" ;		\
 	fi