# HG changeset patch
# User Rik <rik@octave.org>
# Date 1362239965 28800
# Node ID 40a9a4e0d12ab25b963e0588d025d0929ead16af
# Parent  d235ca65c9a9d825094123aa9bffc55a6109b101
pkg.m: Restore ability to use '~' in specifying prefix directories.

* scripts/pkg/pkg.m: Call tilde_expand() on user input before
canonicalize_file_name().

diff --git a/scripts/pkg/pkg.m b/scripts/pkg/pkg.m
--- a/scripts/pkg/pkg.m
+++ b/scripts/pkg/pkg.m
@@ -423,7 +423,7 @@
         local_packages = prefix;
         global_packages = archprefix;
       elseif (length (files) >= 1 && nargout <= 2 && ischar (files{1}))
-        prefix = files{1};
+        prefix = tilde_expand (files{1});
         if (! exist (prefix, "dir"))
           [status, msg, msgid] = mkdir (prefix);
           if (status == 0)
@@ -434,7 +434,7 @@
         local_packages = prefix = canonicalize_file_name (prefix);
         user_prefix = true;
         if (length (files) >= 2 && ischar (files{2}))
-          archprefix = files{2};
+          archprefix = tilde_expand (files{2});
           if (! exist (archprefix, "dir"))
             [status, msg, msgid] = mkdir (archprefix);
             if (status == 0)