[Tsp-devel] [Patch] Installation Prefix change

[Olivier BONHOMME]

Hello,

I made a little patch which changes the installation prefix from /opt to 
/usr.

On this patch, I made the following changes :

- Change the prefix installation
- Change the include directory from /usr/include to /usr/include/tsp
- Update the include path in the pkgconfig configuration file
- Change the prefix and the include directory in the RPM Spec file.

Can you please review and test this patch ?

Best Regards,
Olivier BONHOMME

--- tsp-0.8.3-Source/src/scripts/tsp.pc.in      2006-10-18 11:58:49.000000000 
+0200
+++ tsp-0.8.3-Source_prefix_usr/src/scripts/tsp.pc.in   2007-06-20 
10:26:29.000000000 +0200
@@ -1,7 +1,7 @@
 address@hidden@
 address@hidden@/bin
 address@hidden@/lib
address@hidden@/include
address@hidden@/include/tsp
 
 
 Name: tsp
--- tsp-0.8.3-Source/src/scripts/tsp.spec.in    2007-01-24 20:50:07.000000000 
+0100
+++ tsp-0.8.3-Source_prefix_usr/src/scripts/tsp.spec.in 2007-06-21 
15:25:20.000000000 +0200
@@ -18,7 +18,7 @@
 %description apidoc
 The TSP API documentation as generated by doxygen
 
-%define prefix /opt/tsp-%{version}
+%define prefix /usr
 %define rpmprefix $RPM_BUILD_ROOT%{prefix}
 %define tspsrcdirname %{name}-%{version}-Source
 
@@ -66,7 +66,7 @@
 %attr(0755, root, root) %{prefix}/bin/*
 %attr(0755, root, root) %{prefix}/scripts/*
 %{prefix}/lib
-%{prefix}/include
+%{prefix}/include/tsp
 /usr/lib/pkgconfig/*
 %attr(0755, root, root) /etc/profile.d/*
 
--- tsp-0.8.3-Source/CMakeLists.txt     2007-04-24 15:02:48.000000000 +0200
+++ tsp-0.8.3-Source_prefix_usr/CMakeLists.txt  2007-06-20 10:34:51.000000000 
+0200
@@ -341,7 +341,7 @@
 # see
 # http://www.cmake.org/pipermail/cmake/2006-October/011559.html
 IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  SET(CMAKE_INSTALL_PREFIX "/opt/${PACKAGE_NAME}-${PACKAGE_VERSION}" CACHE 
PATH "Install path prefix" FORCE)
+  SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install path prefix" FORCE)
 ENDIF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
 ################ TSP SDK related config ###########################
--- tsp-0.8.3-Source/make/TSPCMakeTools.cmake   2007-01-25 22:12:05.000000000 
+0100
+++ tsp-0.8.3-Source_prefix_usr/make/TSPCMakeTools.cmake        2007-06-20 
12:01:30.000000000 +0200
@@ -16,7 +16,7 @@
 # define TSP_XINCLUDE MACRO
 MACRO(TSP_XINCLUDE)
   SET (TSP_XINCLUDE_DIR_FOUND "YES")
-  SET (INCLUDE_DIR )
+  SET (INCLUDE_DIR "/tsp" )
   FOREACH(INCLUDE_FILE ${ARGV})
        IF (INCLUDE_FILE STREQUAL "DIRECTORY")
                SET (TSP_XINCLUDE_DIR_FOUND "NO")
@@ -76,4 +76,4 @@
   XINCLUDE_OUTPUT_PATH
   )
 
-MESSAGE(STATUS "TSP CMake Tools loaded.")
\ No newline at end of file
+MESSAGE(STATUS "TSP CMake Tools loaded.")