From 29a2cba501856115bc242462168f051d10635390 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Sat, 22 May 2010 14:14:37 +0000
Subject: [PATCH] Prepend DESTDIR to CMAKE_MODULE_PATH

---
 unicorn/CMakeLists.txt  | 4 ++--
 unicorn/src/CgtMain.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index 4146cad1..4d537664 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -34,13 +34,13 @@ ENDIF(COMMAND CMAKE_POLICY)
 MACRO(SETUP_PROJECT_PATHS project)
   IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
-    SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake/Modules/")
+    SET(PROJECT_MODULE_PATH "${DESTDIR}$ENV{${project}_TOP}/share/cmake/Modules/")
     LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
   ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
 
   IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
-    SET(PROJECT_MODULE_PATH   "$ENV{${project}_USER_TOP}/share/cmake/Modules/")
+    SET(PROJECT_MODULE_PATH "${DESTDIR}$ENV{${project}_USER_TOP}/share/cmake/Modules/")
     LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
   ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
 
diff --git a/unicorn/src/CgtMain.cpp b/unicorn/src/CgtMain.cpp
index 9512d5b8..7072252f 100644
--- a/unicorn/src/CgtMain.cpp
+++ b/unicorn/src/CgtMain.cpp
@@ -157,7 +157,7 @@ int main ( int argc, char *argv[] )
                           "allowed to perform." )
       ( "cell,c"        , poptions::value<string>()
                         , "The name of the cell to load, whithout extension." )
-      ( "save,s"        , poptions::value<string>()->default_value("")
+      ( "save-design,s" , poptions::value<string>()->default_value("")
                         , "Save the routed design.")
       ( "save-global"   , poptions::bool_switch(&saveGlobal)->default_value(false)
                         , "Save the global routing solution.");
@@ -337,8 +337,8 @@ int main ( int argc, char *argv[] )
         kite->dumpMeasures          ();
         kite->destroy               ();
 
-        if ( arguments.count("save") ) {
-          cell->setName ( arguments["save"].as<string>().c_str() );
+        if ( arguments.count("save-design") ) {
+          cell->setName ( arguments["save-design"].as<string>().c_str() );
           af->saveCell ( cell, Catalog::State::Physical );
         }