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

[Thomas Weber]

Author: thomas-guest
Date: 2008-03-30 17:27:09 +0000 (Sun, 30 Mar 2008)
New Revision: 1534

Modified:
   octave-pkg-dev/trunk/octave-pkg.mk.in
   octave-pkg-dev/trunk/postinst-octpkg
   octave-pkg-dev/trunk/prerm-octpkg
Log:
use long options when calling octave

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-30 11:29:35 UTC (rev 1533)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-03-30 17:27:09 UTC (rev 1534)
@@ -40,12 +40,12 @@
 
 .PHONY: install-pkgs
 install-pkg:
-	@OCTAVE@ -f -H -q --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@ --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(),'.']);			\
 		 pkg -verbose -nodeps install ."
 	rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
 	$(shrpkg)/dh/octave-pkg-helper
@@ -62,11 +62,11 @@
 		| perl -pe 's:.*/(.*)\.m::;			\
 			 print "disp (\"[$$1]\")\ntest $$1"'	\
 		>> $$tmp ;					\
-	@OCTAVE@ -q --no-init-file $$tmp ;		\
+	@OCTAVE@ --silent --no-init-file $$tmp ;		\
 	rm -f $$tmp
 
 	@if [ -f debian/check.m ] ; then			\
-		@OCTAVE@ -q --no-init-file --eval	\
+		@OCTAVE@ --silent --no-init-file --eval	\
 			"addpath (genpath ([pwd(),'/debian']));	\
 			 source ('debian/check.m');" ;		\
 	fi

Modified: octave-pkg-dev/trunk/postinst-octpkg
===================================================================
--- octave-pkg-dev/trunk/postinst-octpkg	2008-03-30 11:29:35 UTC (rev 1533)
+++ octave-pkg-dev/trunk/postinst-octpkg	2008-03-30 17:27:09 UTC (rev 1534)
@@ -1,5 +1,5 @@
 # -*- sh -*-
 
 if [ "$1" = configure ] ; then
-    #OCTAVE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
+    #OCTAVE# --norc --silent --no-history --no-site-file --eval "pkg ('rebuild');"
 fi

Modified: octave-pkg-dev/trunk/prerm-octpkg
===================================================================
--- octave-pkg-dev/trunk/prerm-octpkg	2008-03-30 11:29:35 UTC (rev 1533)
+++ octave-pkg-dev/trunk/prerm-octpkg	2008-03-30 17:27:09 UTC (rev 1534)
@@ -2,5 +2,5 @@
 
 case "$1" in
     upgrade|remove|purge)
-        #OCTAVE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
+        #OCTAVE# -norc --silent --no-history --no-site-file --eval "pkg ('rebuild');"
 esac