[Pkg-octave-commit] r1535 - octave-pkg-dev/trunk

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-30 18:36:42 +0000 (Sun, 30 Mar 2008)
New Revision: 1535

Modified:
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Create and use variable $(octave_options)

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-30 17:27:09 UTC (rev 1534)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-30 18:36:42 UTC (rev 1535)
@@ -30,6 +30,7 @@
 pkgname = $(package:octave-%=%)
 hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
 apiversion = $(shell octave-config -p API_VERSION)
+octave_options = --norc --no-history --silent --no-site-file
 
 install/$(package):: create-dirs install-pkg check-pkg remove-dirs
 
@@ -40,12 +41,12 @@
 
 .PHONY: install-pkgs
 install-pkg:
-	@OCTAVE@ --norc --no-history --silent --no-site-file --eval	\
-		"addpath ('$(shrpkg)/m', '-begin');			\
-		 pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'],		\
-		      [pwd(),'/$(debpkg)/$(bpath)']);			\
-		 pkg ('local_list', [pwd(),'.']);			\
-		 pkg ('global_list', [pwd(),'.']);			\
+	@OCTAVE@ $(octave_options) --eval			\
+		"addpath ('$(shrpkg)/m', '-begin');		\
+		 pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'],	\
+		      [pwd(),'/$(debpkg)/$(bpath)']);		\
+		 pkg ('local_list', [pwd(),'.']);		\
+		 pkg ('global_list', [pwd(),'.']);		\
 		 pkg -verbose -nodeps install ."
 	rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
 	$(shrpkg)/dh/octave-pkg-helper
@@ -62,11 +63,11 @@
 		| perl -pe 's:.*/(.*)\.m::;			\
 			 print "disp (\"[$$1]\")\ntest $$1"'	\
 		>> $$tmp ;					\
-	@OCTAVE@ --silent --no-init-file $$tmp ;		\
+	@OCTAVE@ $(octave_options) $$tmp ;			\
 	rm -f $$tmp
 
 	@if [ -f debian/check.m ] ; then			\
-		@OCTAVE@ --silent --no-init-file --eval	\
+		@OCTAVE@ $(octave_options) --eval		\
 			"addpath (genpath ([pwd(),'/debian']));	\
 			 source ('debian/check.m');" ;		\
 	fi