From c7c812445f76cde03d493f6873a25f3b865a6774 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Mon, 3 Dec 2012 15:10:56 +0000
Subject: [PATCH]   * ./bootstrap:     - Change: In Makefile.package, the "dvi"
 target no longer exists         for crlcore.

---
 bootstrap/Makefile.package | 3 +--
 bootstrap/buildCoriolis.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bootstrap/Makefile.package b/bootstrap/Makefile.package
index 5ca09107..0f24fe8a 100644
--- a/bootstrap/Makefile.package
+++ b/bootstrap/Makefile.package
@@ -61,8 +61,7 @@ install: FORCE
 	  cd build.dir/$$tool;                                    \
 	  makeArgs="";                                            \
 	  cmakeArgs="$$commonCMakeArgs -D BUILD_DOC:STRING=OFF";  \
-	  if [  "$$tool" = "crlcore"                              \
-	     -o "$$tool" = "stratus1" ]; then                     \
+	  if [ "$$tool" = "stratus1" ]; then                      \
 	    makeArgs="dvi safepdf html";                          \
 	    cmakeArgs="$$commonCMakeArgs -D BUILD_DOC:STRING=ON"; \
 	  fi;                                                     \
diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py
index c4034d35..1838688a 100755
--- a/bootstrap/buildCoriolis.py
+++ b/bootstrap/buildCoriolis.py
@@ -582,7 +582,7 @@ class ProjectBuilder:
 
        # Remove unpublisheds (yet) tools/files.
         for item in self._packageExcludes:
-            command = [ "/bin/rm", "-r", os.path.join(self._archiveDir,item) ]
+            command = [ "/bin/rm", "-rf", os.path.join(self._archiveDir,item) ]
             self._execute ( command, "rm of %s failed" % item)
 
        # Adds files neededs only for packaging purpose.