Use more normal path variables

git-svn-id: http://libproxy.googlecode.com/svn/trunk@695 c587cffe-e639-0410-9787-d7902ae8ed56

10 files changed, 38 insertions, 45 deletions

diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index f1ce1d2..2aab92c 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -23,5 +23,5 @@ endif()
 # Install Vala bindings / Install only when -DWITH_VALA is passed to cmake.
 option(WITH_VALA "Enables Vala bindings" OFF)
 if(WITH_VALA)
-  install(FILES vala/libproxy-1.0.vapi DESTINATION ${datadir}/vala/vapi)
+  install(FILES vala/libproxy-1.0.vapi DESTINATION ${SHARE_INSTALL_PREFIX}/vala/vapi)
 endif()
diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt
index 44ee9bb..8e8c4ac 100644
--- a/bindings/perl/src/CMakeLists.txt
+++ b/bindings/perl/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/libproxy )
 link_directories(${LIBPROXY_LIBRARY_DIRS})
 
diff --git a/cmake/paths.cmk b/cmake/paths.cmk
index c53a83a..940b0b4 100644
--- a/cmake/paths.cmk
+++ b/cmake/paths.cmk
@@ -1,22 +1,17 @@
-# Setup our relative paths
-if(${WIN32})
-  set(rlibdir     .)
-  set(rlibexecdir .)
-  set(rbindir     .)
-  set(rincludedir include/)
-  set(rdatadir    .)
-else()
-  set(rlibdir     lib${LIB_SUFFIX}/)
-  set(rlibexecdir libexec/)
-  set(rbindir     bin/)
-  set(rincludedir include/)
-  set(rdatadir    share/)
-endif()
-
-# Setup our full paths
-set(prefix     ${CMAKE_INSTALL_PREFIX}  CACHE PATH "prefix")
-set(libdir     ${prefix}/${rlibdir}     CACHE PATH "libdir")
-set(libexecdir ${prefix}/${rlibexecdir} CACHE PATH "libexecdir")
-set(bindir     ${prefix}/${rbindir}     CACHE PATH "bindir")
-set(includedir ${prefix}/${rincludedir} CACHE PATH "includedir")
-set(datadir    ${prefix}/${rdatadir}    CACHE PATH "datadir")
+if(WIN32)
+  set(CMAKE_INSTALL_PREFIX ""                                       CACHE PATH "Install prefix")
+  set(BIN_INSTALL_DIR      ${CMAKE_INSTALL_PREFIX}                  CACHE PATH "Binary install dir")
+  set(LIB_INSTALL_DIR      ${CMAKE_INSTALL_PREFIX}                  CACHE PATH "Library install dir")
+  set(LIBEXEC_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}                  CACHE PATH "Private executable install dir")
+  set(INCLUDE_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}/include          CACHE PATH "Include install dir")
+  set(SYSCONF_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}                  CACHE PATH "Configuration install dir")
+  set(SHARE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}                  CACHE PATH "Data install dir")
+else(WIN32)
+  set(CMAKE_INSTALL_PREFIX /usr/local                               CACHE PATH "Install prefix")
+  set(BIN_INSTALL_DIR      ${CMAKE_INSTALL_PREFIX}/bin              CACHE PATH "Binary install dir")
+  set(LIB_INSTALL_DIR      ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Library install dir")
+  set(LIBEXEC_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}/libexec          CACHE PATH "Private executable install dir")
+  set(INCLUDE_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}/include          CACHE PATH "Include install dir")
+  set(SYSCONF_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}/etc              CACHE PATH "Configuration install dir")
+  set(SHARE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/share            CACHE PATH "Data install dir")
+endif(WIN32)
diff --git a/libmodman/CMakeLists.txt b/libmodman/CMakeLists.txt
index 9de114a..72c70b8 100644
--- a/libmodman/CMakeLists.txt
+++ b/libmodman/CMakeLists.txt
@@ -4,7 +4,7 @@ if(NOT WIN32)
   target_link_libraries(libmodman dl)
 endif()
 set_target_properties(libmodman PROPERTIES PREFIX "" VERSION 0.0.0 SOVERSION 0)
-install(TARGETS libmodman DESTINATION ${libdir})
+install(TARGETS libmodman DESTINATION ${LIB_INSTALL_PREFIX})
 
 ### Tests
 if (BUILD_TESTING)
diff --git a/libproxy/cmake/devfiles.cmk b/libproxy/cmake/devfiles.cmk
index 4d810be..8502e44 100644
--- a/libproxy/cmake/devfiles.cmk
+++ b/libproxy/cmake/devfiles.cmk
@@ -1,9 +1,9 @@
 if(NOT WIN32 AND NOT APPLE)
   # PkgConfig file
   configure_file(${CMAKE_SOURCE_DIR}/libproxy/libproxy-1.0.pc.in ${CMAKE_BINARY_DIR}/libproxy-1.0.pc @ONLY)
-  install(FILES ${CMAKE_BINARY_DIR}/libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig)
+  install(FILES ${CMAKE_BINARY_DIR}/libproxy-1.0.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
   
   # CMake Find helper
   configure_file(${CMAKE_SOURCE_DIR}/libproxy/Findlibproxy.cmake.in ${CMAKE_BINARY_DIR}/Findlibproxy.cmake @ONLY)
-  install(FILES ${CMAKE_BINARY_DIR}/Findlibproxy.cmake DESTINATION ${datadir}/cmake/Modules)
-endif()
\ No newline at end of file
+  install(FILES ${CMAKE_BINARY_DIR}/Findlibproxy.cmake DESTINATION ${SHARE_INSTALL_PREFIX}/cmake/Modules)
+endif()
diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk
index 356bddd..2c2cfa9 100644
--- a/libproxy/cmake/libproxy.cmk
+++ b/libproxy/cmake/libproxy.cmk
@@ -4,13 +4,13 @@ if(WIN32)
 else()
   target_link_libraries(libproxy modman;m;pthread;dl;${LIBPROXY_LIBRARIES})
 endif()
-file(TO_NATIVE_PATH ${moduledir} moduledir)
+file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR)
 if(WIN32)
-  string(REGEX REPLACE "\\\\" "\\\\\\\\" moduledir ${moduledir})
+  string(REGEX REPLACE "\\\\" "\\\\\\\\" MODULE_INSTALL_DIR ${MODULE_INSTALL_DIR})
 endif()
 
 set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
-             PROPERTY COMPILE_DEFINITIONS MODULEDIR="${moduledir}";BUILTIN_MODULES=${BUILTIN_MODULES})
+             PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULE_INSTALL_DIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
 set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
-install(TARGETS libproxy DESTINATION ${libdir})
-install(FILES   proxy.h  DESTINATION ${includedir})
\ No newline at end of file
+install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
+install(FILES   proxy.h  DESTINATION ${INCLUDE_INSTALL_DIR})
diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk
index e42f989..a18692d 100644
--- a/libproxy/cmake/modules.cmk
+++ b/libproxy/cmake/modules.cmk
@@ -1,10 +1,9 @@
 # Setup module path
-if(${WIN32})
-  set(rmoduledir modules/)
+if(WIN32)
+  set(MODULE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/modules CACHE PATH "Module install dir")
 else()
-  set(rmoduledir ${rlibdir}${PROJECT_NAME}/${PROJECT_VERSION}/modules/)
+  set(MODULE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/${PROJECT_VERSION}/modules CACHE PATH "Module install dir")
 endif()
-set(moduledir ${prefix}/${rmoduledir} CACHE PATH "moduledir")
 
 # Do module determination
 include(cmake/pxmodule.cmk)
@@ -39,4 +38,4 @@ px_module(network_networkmanager   "${NM_FOUND}"     0       ${NM_LIBRARIES})
 px_module(pacrunner_mozjs          "${MOZJS_FOUND}"  ${BIPR} ${MOZJS_LIBRARIES})
 px_module(pacrunner_webkit         "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES})
 px_module(wpad_dns_alias           1                 1)
-message("")
\ No newline at end of file
+message("")
diff --git a/libproxy/cmake/modules/config_gnome.cmk b/libproxy/cmake/modules/config_gnome.cmk
index ae6c159..2883b2b 100644
--- a/libproxy/cmake/modules/config_gnome.cmk
+++ b/libproxy/cmake/modules/config_gnome.cmk
@@ -5,6 +5,6 @@ if (NOT WIN32 AND NOT APPLE)
   if(GNOME_FOUND)
     add_executable(pxgconf modules/pxgconf.cpp)
     target_link_libraries(pxgconf ${GNOME_LIBRARIES})
-    install(TARGETS pxgconf RUNTIME DESTINATION ${libexecdir})
+    install(TARGETS pxgconf RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
   endif()
-endif()
\ No newline at end of file
+endif()
diff --git a/libproxy/cmake/pxmodule.cmk b/libproxy/cmake/pxmodule.cmk
index c1762df..bd7d49b 100644
--- a/libproxy/cmake/pxmodule.cmk
+++ b/libproxy/cmake/pxmodule.cmk
@@ -3,7 +3,7 @@ function(px_module name build builtin)
   if(build)
     if(builtin)
       set(built "*")
-      set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${libexecdir}";MM_MODULE_BUILTIN=${name})
+      set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${LIBEXEC_INSTALL_DIR}";MM_MODULE_BUILTIN=${name})
       set(LIBPROXY_SOURCES ${LIBPROXY_SOURCES} modules/${name}.cpp PARENT_SCOPE)
       set(BUILTIN_MODULES "${BUILTIN_MODULES} \"${name}\"," PARENT_SCOPE)
       if(${ARGC} GREATER 3)
@@ -11,15 +11,15 @@ function(px_module name build builtin)
       endif()
     else()
       set(built "m")
-      set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${libexecdir}")
+      set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
       add_library(${name} MODULE modules/${name}.cpp)
       target_link_libraries(${name} libproxy)
       set_target_properties(${name} PROPERTIES PREFIX "")
-      install(TARGETS ${name} LIBRARY DESTINATION ${moduledir})
+      install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR})
       if(${ARGC} GREATER 3)
         target_link_libraries(${name} ${ARGN})
       endif()
     endif()
   endif()
   message("\t${built}\t${name}")
-endfunction(px_module)
\ No newline at end of file
+endfunction(px_module)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 6330cb8..14cdb20 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -3,4 +3,4 @@ link_directories(${LIBPROXY_LIBRARY_DIRS})
 
 add_executable(proxy proxy.c)
 target_link_libraries(proxy libproxy)
-install(TARGETS proxy RUNTIME DESTINATION ${rbindir})
+install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR})