[Octave-cvsupdate] SF.net SVN: octave:[9965] trunk/octave-forge/main/geometry

[<jpi...@us...>]

Revision: 9965
          http://octave.svn.sourceforge.net/octave/?rev=9965&view=rev
Author:   jpicarbajal
Date:     2012-03-19 09:30:27 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
geometry: removing keyboard from PKG*

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/PKG_ADD
    trunk/octave-forge/main/geometry/PKG_DEL

Modified: trunk/octave-forge/main/geometry/PKG_ADD
===================================================================
--- trunk/octave-forge/main/geometry/PKG_ADD	2012-03-19 02:48:56 UTC (rev 9964)
+++ trunk/octave-forge/main/geometry/PKG_ADD	2012-03-19 09:30:27 UTC (rev 9965)
@@ -1,6 +1,6 @@
 %1
 dirlist = {"geom2d","io","polygons2d","shape2d","octclip", "graphs"};
-dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
+dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")))
 pp = strsplit (dirname,filesep (), true);
 
 %% Check if prefix was used
@@ -12,7 +12,8 @@
 arch = cstrcat (octave_config_info ("canonical_host_type"),
                               "-", octave_config_info ("api_version"));
 if strcmp (arch , pp{end})
-  dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
+  dirname = [strcat(filesep(),{pp{1:end-1}}){:}]
+%  dirname = [pkg("prefix") filesep() pp{end-1}]
   pkg_folder = strsplit (pkg_folder,filesep (), true);
   pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
 end
@@ -22,6 +23,7 @@
   for ii=1:length (dirlist)
     addpath ( [ pkg_folder filesep() dirlist{ii}],"-end")
   endfor
+
 else
 %% Testing
   warning("geometry:Devel","Adding path for testing.");

Modified: trunk/octave-forge/main/geometry/PKG_DEL
===================================================================
--- trunk/octave-forge/main/geometry/PKG_DEL	2012-03-19 02:48:56 UTC (rev 9964)
+++ trunk/octave-forge/main/geometry/PKG_DEL	2012-03-19 09:30:27 UTC (rev 9965)
@@ -13,7 +13,8 @@
                               "-", octave_config_info ("api_version"));
 pp = strsplit (dirname,filesep (), true);
 if strcmp(arch , pp{end})
-  dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
+  %dirname = [strcat(filesep(),{pp{1:end-1}}){:}]
+  dirname = [pkg("prefix") filesep() pp{end-1}];
   pkg_folder = strsplit (pkg_folder,filesep (), true);
   pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
 end

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.