# HG changeset patch # User dbateman # Date 1159817048 0 # Node ID f542445f6b7ab6cb5ecf0f4151fb2235b350b21d # Parent f717f9e37d8f5ef1dc8cb2ce99e887e86aef2ec6 [project @ 2006-10-02 19:24:08 by dbateman] diff -r f717f9e37d8f -r f542445f6b7a scripts/ChangeLog --- a/scripts/ChangeLog Mon Oct 02 17:44:43 2006 +0000 +++ b/scripts/ChangeLog Mon Oct 02 19:24:08 2006 +0000 @@ -1,3 +1,7 @@ +2006-10-02 David Bateman + + * pkg/pkg.m (copy_files): always create installation directory. + 2006-10-02 Thomas Weber * miscellaneous/doc.m: Swap file and directory args to info. diff -r f717f9e37d8f -r f542445f6b7a scripts/pkg/pkg.m --- a/scripts/pkg/pkg.m Mon Oct 02 17:44:43 2006 +0000 +++ b/scripts/pkg/pkg.m Mon Oct 02 19:24:08 2006 +0000 @@ -591,15 +591,17 @@ endfunction function copy_files (desc, packdir, bindir) + ## Create the installation directory + if (! exist (desc.dir, "dir")) + [status, output] = mkdir (desc.dir); + if (status != 1) + error("Couldn't create installation directory %s : %s\n", + desc.dir, output); + endif + endif + ## Copy the files from "inst" to installdir if (! dirempty([packdir "inst"])) - if (! exist (desc.dir, "dir")) - [status, output] = mkdir (desc.dir); - if (status != 1) - error("Couldn't create installation directory %s : %s\n", - desc.dir, output); - endif - endif [status, output] = system(["cp -R " packdir "inst/* " desc.dir]); if (status != 0) rm_rf(desc.dir);