*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index 6a5c2a3c02725a53af0febbb7883cd759dd431b6..b9f4e0138fc876164fb3bf80166897dc6449c18d 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackagePaths.cmake
+++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake
@@ -1,6 +1,8 @@
 # Use the installed appli 
 
 IF(WIN32)
+  SET (EXECUTABLE_OUTPUT_REL_PATH "") 
+  SET (LIBRARY_OUTPUT_REL_PATH    "")
   FILE(TO_NATIVE_PATH  ${PROJECT_BINARY_DIR}/$(OutDir)  BBTK_BIN_PATH)
   # TO DO : use computed path for build/install tree
   SET(BBTK_BBI "${BBTK_DIR}/bin/bbi")
@@ -10,13 +12,14 @@ IF(WIN32)
   SET(BBTK_BBDOC "${BBTK_DIR}/bin/bbdoc")
   
 ELSE(WIN32)
-  FILE(TO_NATIVE_PATH  ${EXECUTABLE_OUTPUT_PATH}  BBTK_BIN_PATH)
-  # TO DO : use computed path for build/install tree
-  SET(BBTK_BBI "${BBTK_DIR}/../../bin/bbi")
-  SET(BBTK_BBS2CPP "${BBTK_DIR}/../../bin/bbs2cpp")
-  SET(BBTK_BBC "${BBTK_DIR}/../../bin/bbc")
-  SET(BBTK_BBFY "${BBTK_DIR}/../../bin/bbfy")
-  SET(BBTK_BBDOC "${BBTK_DIR}/../../bin/bbdoc")  
+#  SET (EXECUTABLE_OUTPUT_REL_PATH bin) 
+#  SET (LIBRARY_OUTPUT_REL_PATH    bin)
+  SET(BBTK_BIN_PATH ${BBTK_INSTALL_PREFIX}/bin)
+  SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi")
+  SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp")
+  SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc")
+  SET(BBTK_BBFY "${BBTK_BIN_PATH}/bbfy")
+  SET(BBTK_BBDOC "${BBTK_BIN_PATH}/bbdoc")  
 ENDIF(WIN32)
 
 

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index c971745209a36e5522e3138173bb81e75be6a44d..be932d30fa02d5bdc030286043c1d926df56a743 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -68,7 +68,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
   
   # runs bbtk-make-index as a post install step
   IF(NOT BBTK_CORE_PACKAGE)
-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND bbtk-make-index)")
+    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbtk-make-index)")
   ENDIF(NOT BBTK_CORE_PACKAGE)
 
 

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index 1b6136449df5f9b6908e6feb85cee4383222ccf8..316dc9dda9b1e389cedf1968ba26631c2cfff09d 100644 (file)
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -61,6 +61,10 @@ ENDIF(WIN32)
 
 #-----------------------------------------------------------------------------
 
+#-----------------------------------------------------------------------------
+SET(BBTK_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 # The vars BBTK_DOC_REL_PATH and BBTK_BBS_REL_PATH
 # store documentation and scripts **RELATIVE** paths  

diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake
index c39d4c030e03d5c3570157ae6ae5e9e8691060e2..fae2ed86984fce00c167666c197f4fecef65a128 100644 (file)
--- a/kernel/cmake/BBTKSetDeducedPaths.cmake
+++ b/kernel/cmake/BBTKSetDeducedPaths.cmake
@@ -10,11 +10,11 @@ SET(BBTK_DOXYGEN_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOXYGEN_REL_PATH})
 SET(BBTK_BBS_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH})
 SET(BBTK_DATA_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DATA_REL_PATH})
 
-SET(BBTK_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH})
-SET(BBTK_BBDOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH})
-SET(BBTK_DOXYGEN_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH})
-SET(BBTK_BBS_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH})
-SET(BBTK_DATA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DATA_REL_PATH})
+SET(BBTK_DOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH})
+SET(BBTK_BBDOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH})
+SET(BBTK_DOXYGEN_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH})
+SET(BBTK_BBS_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH})
+SET(BBTK_DATA_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DATA_REL_PATH})
 
 # Create build directories if necessary
 MKDIR(${BBTK_DOC_BUILD_PATH})

diff --git a/kernel/cmake/CMakeCreateFindPackage_LibraryConfig.cmake.in b/kernel/cmake/CMakeCreateFindPackage_LibraryConfig.cmake.in
index 265f7e187d75acb76101688e95453e466691246f..d609ed65d5d61aa09a45fd025dc4b9befb939478 100644 (file)
--- a/kernel/cmake/CMakeCreateFindPackage_LibraryConfig.cmake.in
+++ b/kernel/cmake/CMakeCreateFindPackage_LibraryConfig.cmake.in
@@ -76,6 +76,8 @@ FOREACH(path ${CFP_RELATIVE_LIBRARY_PATHS})
     )
 ENDFOREACH(path ${CFP_RELATIVE_LIBRARY_PATHS})
 
+# Set the "prefix path"
+SET(@LIBRARY_NAME@_INSTALL_PREFIX ${CFP_LIBRARY_PATH_PREFIX})
 
 # The C and C++ flags added by @LIBRARY_NAME@ to the cmake-configured flags.
 SET(@LIBRARY_NAME@_REQUIRED_C_FLAGS "@CFP_LIB_REQUIRED_C_FLAGS@")

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index 7e9a8f5e235abd29c112d8bda8eccdf4b9e848cd..66daead6803412e30ae8bd4da7a34a0e260da805 100644 (file)
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -79,6 +79,11 @@ CONFIGURE_FILE(
   ${BBTK_BBDOC_BUILD_PATH}/bbtk-make-index
   @ONLY
   )
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/bbtk-make-index.sh.in
+  ${BBTK_BIN_PATH}/bbtk-make-index
+  @ONLY
+  )
 INSTALL(
   PROGRAMS ${BBTK_BBDOC_BUILD_PATH}/bbtk-make-index
   DESTINATION bin

diff --git a/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in b/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in
index 835627fc081f9e7a11c47d0be01bed7d77456761..6028095823be7c7edfb0148e0fc105998268acb0 100755 (executable)
--- a/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in
+++ b/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in
@@ -7,13 +7,12 @@ source ${HOME}/.bashrc
 echo "** Recreating bbtk doc index **"
 
 TMP=$(which $0|rev)
-TMP2=$(echo ${TMP#*/}|rev)
-DIR=${TMP2}/../@bbtk_install_gnome_DATA_REL_PATH@
+BIN=$(echo ${TMP#*/}|rev)
 
-echo "> cd ${DIR}/@BBTK_BBDOC_REL_PATH@"
-cd ${DIR}/@BBTK_BBDOC_REL_PATH@
+echo "> cd ${BIN}/../@BBTK_BBDOC_REL_PATH@"
+cd ${BIN}/../@BBTK_BBDOC_REL_PATH@
 
-echo "> bbi -n ./make-index"
-bbi -n ./make-index
+echo "> ${BIN}/bbi ./make-index"
+${BIN}/bbi ./make-index
 
 echo "** Done ! **"