[Pkg-octave-commit] [SCM] octave-pkg-dev branch, master, updated. 94f3c0b0494950c0e3b9be235b76b952160d9ded

[Rafael Laboissiere]

tags 528506 pending
thanks

The following commit has been merged in the master branch:
commit 8eb39fad63b753483840a5fc410798797b6d202e
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Wed May 13 15:31:35 2009 +0200

    Create global and local package list files inside the build directory

diff --git a/debian/changelog b/debian/changelog
index 2858617..fa6fd38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 octave-pkg-dev (0.6.7) UNRELEASED; urgency=low
 
+  * octave-pkg.mk.in: Create global and local package list files inside
+    the build directory (closes: #528506)
   * debian/control: The Debian packaging files are now maintained through
     a Git repository at alioth.debian.org.  Switch the Vcs-* URLs to Git,
     accordingly.
diff --git a/octave-pkg.mk.in b/octave-pkg.mk.in
index ed56ad6..8a12023 100644
--- a/octave-pkg.mk.in
+++ b/octave-pkg.mk.in
@@ -34,6 +34,8 @@ pkgname = $(package:octave-%=%)
 hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
 apiversion = $(shell octave-config -p API_VERSION)
 octave_options = --no-history --silent --no-init-file
+global_list = global-list
+local_list = local-list
 
 export OCTAVE_HISTFILE=/dev/null
 # even with '--no-history', Octave creates an empty .octave_hist at startup,
@@ -55,14 +57,14 @@ create-dirs:
 .PHONY: install-pkgs
 install-pkg:
 	-[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
-	@OCTAVE@ $(octave_options) --eval			\
-		 "pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'],	\
-		      [pwd(),'/$(debpkg)/$(bpath)']);		\
-		 pkg ('local_list', [pwd(),'.']);		\
-		 pkg ('global_list', [pwd(),'.']);		\
-		 if (glob ('PKG_ADD.bak')),			\
-		     movefile ('PKG_ADD.bak', 'PKG_ADD');	\
-		 endif;						\
+	@OCTAVE@ $(octave_options) --eval				\
+		 "pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'],		\
+		      [pwd(),'/$(debpkg)/$(bpath)']);			\
+		 pkg ('local_list', [pwd(),'/$(local_list)']);		\
+		 pkg ('global_list', [pwd(),'/$(global_list)']);	\
+		 if (glob ('PKG_ADD.bak')),				\
+		     movefile ('PKG_ADD.bak', 'PKG_ADD');		\
+		 endif;							\
 		 pkg -verbose -nodeps install ."
 	$(shrpkg)/dh/octave-pkg-helper
 	dh_install --package=$(package)
@@ -119,4 +121,4 @@ clean::
 ifneq ($(DEB_MAKE_CLEAN_TARGET),)
 	-$(MAKE) -k $(DEB_MAKE_CLEAN_TARGET)
 endif
-	rm -rf inst/$(hosttype)-$(apiversion)
+	rm -rf inst/$(hosttype)-$(apiversion) $(global_list) $(local_list)

-- 
octave-pkg-dev