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

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-27 20:44:24 +0000 (Thu, 27 Mar 2008)
New Revision: 1527

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Remove setting of LD_LIBRARY_PATH.  This is not currently needed for
any package.


Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-03-27 20:27:15 UTC (rev 1526)
+++ octave-pkg-dev/trunk/debian/changelog	2008-03-27 20:44:24 UTC (rev 1527)
@@ -18,9 +18,6 @@
       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
     + Call dh_install to install extra files needed for the the unit
       testing
   * octave-pkg-helper: Get information directly from file DESCRIPTION,

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-27 20:27:15 UTC (rev 1526)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-27 20:44:24 UTC (rev 1527)
@@ -30,8 +30,6 @@
 pkgname = $(package:octave-%=%)
 hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
 apiversion = $(shell octave-config -p API_VERSION)
-octlibdir = $(shell octave-config -p OCTLIBDIR)
-ldpath = LD_LIBRARY_PATH=$(debpkg)$(octlibdir)
 
 install/$(package):: create-dirs install-pkg check-pkg remove-dirs
 
@@ -64,11 +62,11 @@
 		| perl -pe 's:.*/(.*)\.m::;			\
 			 print "disp (\"[$$1]\")\ntest $$1"'	\
 		>> $$tmp ;					\
-	$(ldpath) @OCTAVE@ -q --no-init-file $$tmp ;		\
+	@OCTAVE@ -q --no-init-file $$tmp ;		\
 	rm -f $$tmp
 
 	@if [ -f debian/check.m ] ; then			\
-		$(ldpath) @OCTAVE@ -q --no-init-file --eval	\
+		@OCTAVE@ -q --no-init-file --eval	\
 			"addpath (genpath ([pwd(),'/debian']));	\
 			 source ('debian/check.m');" ;		\
 	fi