diff options
| -rw-r--r-- | accel-pptpd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/cpack.cmake | 6 | ||||
| -rw-r--r-- | cmake/debian/debian.cmake | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/accel-pptpd/CMakeLists.txt b/accel-pptpd/CMakeLists.txt index 0d3641af..618cf0d9 100644 --- a/accel-pptpd/CMakeLists.txt +++ b/accel-pptpd/CMakeLists.txt @@ -23,7 +23,7 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) ) STRING(STRIP ${ACCEL_PPTP_VERSION} ACCEL_PPTP_VERSION) ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) - SET (ACCEL_PPTP_VERSION 1.3.1) + SET (ACCEL_PPTP_VERSION 1.3.2) ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) ADD_DEFINITIONS(-DACCEL_PPTP_VERSION="${ACCEL_PPTP_VERSION}") diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index b627b43b..c8aa4e02 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -2,7 +2,7 @@ INCLUDE(InstallRequiredSystemLibraries) SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "3") -SET(CPACK_PACKAGE_VERSION_PATCH "1") +SET(CPACK_PACKAGE_VERSION_PATCH "2") SET(CPACK_PACKAGE_NAME "accel-pptp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>") @@ -15,8 +15,8 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") #SET(CPACK_STRIP_FILES "usr/sbin/accel-pptpd") #SET(CPACK_PACKAGE_EXECUTABLES "usr/sbin/accel-ppptp") -IF(CMAKE_BUILD_TYPE STREQUAL Debian) +IF(CPACK_TYPE STREQUAL Debian) INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) -ENDIF(CMAKE_BUILD_TYPE STREQUAL Debian) +ENDIF(CPACK_TYPE STREQUAL Debian) INCLUDE(CPack) diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake index 8fe2be28..1e8f0b79 100644 --- a/cmake/debian/debian.cmake +++ b/cmake/debian/debian.cmake @@ -1,5 +1,5 @@ -SET(CPACK_PACKAGING_INSTALL_PREFIX "/") -SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCH}) +SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr") +SET(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}) if (BUILD_DRIVER_ONLY) SET(CPACK_PACKAGE_NAME "accel-pptp-kmod") @@ -9,9 +9,9 @@ if (BUILD_DRIVER_ONLY) #SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})") else (BUILD_DRIVER_ONLY) SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 7.6)") - SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst") + SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/conffiles") - INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pptpd/accel-pptp.conf DESTINATION etc RENAME accel-pptp.conf.dist) - INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-init DESTINATION etc/init.d RENAME accel-pptp) - INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-default DESTINATION etc/default RENAME accel-pptp) + INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pptpd/accel-pptp.conf DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc RENAME accel-pptp.conf.dist) + INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-init DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/init.d RENAME accel-pptp) + INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-default DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/default RENAME accel-pptp) endif (BUILD_DRIVER_ONLY) |