# HG changeset patch
# User David Bateman <dbateman@free.fr>
# Date 1209454626 14400
# Node ID 1434a2687447f1c9d57a8f2e6c2f25de47650999
# Parent  9f1b322fe0a972531442b7124f133fc75b716b2b
Set archprefix for -local and -global options to pkg

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-29  David Bateman  <dbateman@free.fr>
+
+	pkg/pkg.m: Also set archprefix with the -local and -global options.
+
 2008-04-29  Jonathan Stickel  <jjstickel@vcn.com>
 
 	* statistics/distributions/tcdf.m, statistics/distributions/tinv.m:
diff --git a/scripts/pkg/pkg.m b/scripts/pkg/pkg.m
--- a/scripts/pkg/pkg.m
+++ b/scripts/pkg/pkg.m
@@ -248,11 +248,14 @@
 	global_install = false;
 	if (! user_prefix)
 	  prefix = tilde_expand (fullfile ("~", "octave"));
+	  archprefix = prefix;
 	endif
       case "-global"
 	global_install = true;
 	if (! user_prefix)
 	  prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
+	  archprefix = fullfile (octave_config_info ("libexecdir"),
+				 "octave", "packages");
 	endif
       case available_actions
 	if (strcmp (action, "none"))