From 5e306d27c1767c49c813e5d162da32bb09dbde92 Mon Sep 17 00:00:00 2001
From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 4 Mar 2010 16:09:05 +0000
Subject: [PATCH] Make the distrib.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7195 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/CPACK/src/CMakeDistrib.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/buildtools/CPACK/src/CMakeDistrib.txt b/buildtools/CPACK/src/CMakeDistrib.txt
index b094d438cf..140aa5ea8d 100644
--- a/buildtools/CPACK/src/CMakeDistrib.txt
+++ b/buildtools/CPACK/src/CMakeDistrib.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
 
-set(prefix "/home/navarrop/Bureau/test_install/")
-set(CPACK_SET_DESTDIR on)
 set(simgrid_version "3.3.5")
 
 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
@@ -9,9 +7,9 @@ set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}_rev_${SVN_VERSION}")
 set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
-	
+
 if(distrib)
-	
+
 set(to_svg	
 	${XBT_RL_SRC}
 	${EXTRA_DIST}
@@ -51,8 +49,6 @@ set(to_svg
 		install(FILES ${file} DESTINATION "${file_location}")
 	endforeach(file ${EXTRA_DIST})
 
-	set(CMAKE_INSTALL_PREFIX .)
-
 	###copy doc
 	install(DIRECTORY "${PROJECT_DIRECTORY}/doc/"
 	DESTINATION "doc/"
@@ -68,11 +64,13 @@ set(to_svg
 	PATTERN ".git" EXCLUDE 
 	PATTERN "*~" EXCLUDE
 	)
+	set(CPACK_SET_DESTDIR on)
+	set(CMAKE_INSTALL_PREFIX .)
 
-elseif(distrib)
-
-	set(CMAKE_INSTALL_PREFIX ${prefix})
+endif(distrib)
 
+if(NOT distrib)
+	
 	###install libs
 	install(DIRECTORY "${PROJECT_DIRECTORY}/src/.libs/"
 	DESTINATION "lib/"
@@ -92,7 +90,9 @@ elseif(distrib)
 	DIRECTORY "${PROJECT_DIRECTORY}/doc/html/" 
 	DESTINATION "doc/simgrid/html" 
 	)	
+	set(CPACK_SET_DESTDIR on)
+	set(CMAKE_INSTALL_PREFIX ${prefix})
 
-endif(distrib)
+endif(NOT distrib)
 
 include(CPack)
-- 
2.20.1