Mercurial > hg > octave-nkf

diff scripts/pkg/private/configure_make.m @ 14471:d2c095e45196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Remove redundant private function from the package manager. * pkg/private/rm_rf.m: remove file. * pkg/provate/build.m: remove calls to rm_rf. * pkg/provate/configure_make.m: remove calls to rm_rf. * pkg/provate/copy_files.m: remove calls to rm_rf. * pkg/provate/finish_installation.m: remove calls to rm_rf. * pkg/provate/install.m: remove calls to rm_rf. * pkg/provate/packinfo_copy_file.m: remove calls to rm_rf. * pkg/provate/prepare_installation.m: remove calls to rm_rf. * pkg/provate/repackage.m: remove calls to rm_rf. * pkg/provate/uninstall.m: remove calls to rm_rf.
author Carlo de Falco <kingcrimson@tiscali.it>
date Fri, 16 Mar 2012 18:55:09 +0100
parents cfb0173fe1ca
children a46b8b0bd325
line wrap: on
line diff
--- a/scripts/pkg/private/configure_make.m
+++ b/scripts/pkg/private/configure_make.m
@@ -56,7 +56,7 @@
                                          "./configure --prefix=\"",
                                          desc.dir, "\"", flags));
       if (status != 0)
-        rm_rf (desc.dir);
+        rmdir (desc.dir, "s");
         error ("the configure script returned the following error: %s", output);
       elseif (verbose)
         printf("%s", output);
@@ -68,7 +68,7 @@
     if (exist (fullfile (src, "Makefile"), "file"))
       [status, output] = shell (cstrcat (scenv, "make -C '", src, "'"));
       if (status != 0)
-        rm_rf (desc.dir);
+        rmdir (desc.dir, "s");
         error ("'make' returned the following error: %s", output);
       elseif (verbose)
         printf("%s", output);
@@ -134,7 +134,7 @@
           endif
           [status, output] = copyfile (archindependent, instdir);
           if (status != 1)
-            rm_rf (desc.dir);
+            rmdir (desc.dir, "s");
             error ("Couldn't copy files from 'src' to 'inst': %s", output);
           endif
         endif
@@ -149,7 +149,7 @@
           endif
           [status, output] = copyfile (archdependent, archdir);
           if (status != 1)
-            rm_rf (desc.dir);
+            rmdir (desc.dir, "s");
             error ("Couldn't copy files from 'src' to 'inst': %s", output);
           endif
         endif