summaryrefslogtreecommitdiff
path: root/cmake/debian
diff options
context:
space:
mode:
authorKozlov Dmitry <dima@server>2011-05-30 16:21:30 +0400
committerKozlov Dmitry <dima@server>2011-05-30 16:21:30 +0400
commit4497c1bae58e5920a250df95abb959d4b3d980b4 (patch)
tree2d33ee7b4ae7dd1ba59be80220db3232ea1f736c /cmake/debian
parent6dd6ad03bb7d9a9b687f2c3468dfdc2d102a0dda (diff)
downloadaccel-ppp-4497c1bae58e5920a250df95abb959d4b3d980b4.tar.gz
accel-ppp-4497c1bae58e5920a250df95abb959d4b3d980b4.zip
1.3.6 release
Diffstat (limited to 'cmake/debian')
-rw-r--r--cmake/debian/debian.cmake3
-rwxr-xr-xcmake/debian/postinst4
2 files changed, 4 insertions, 3 deletions
diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake
index b7bd029..0fcc2d5 100644
--- a/cmake/debian/debian.cmake
+++ b/cmake/debian/debian.cmake
@@ -10,7 +10,7 @@ if (BUILD_DRIVER_ONLY)
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "accel-pptp kernel module")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "")
SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian-kmod/postinst")
- INSTALL(DIRECTORY lib/modules/${DEBIAN_KDIR}/extra)
+ #INSTALL(DIRECTORY lib/modules/${DEBIAN_KDIR}/extra)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/driver/driver/pptp.ko DESTINATION lib/modules/${DEBIAN_KDIR}/extra)
#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})")
else (BUILD_DRIVER_ONLY)
@@ -21,4 +21,5 @@ else (BUILD_DRIVER_ONLY)
INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc RENAME accel-ppp.conf.dist)
INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/init.d RENAME accel-ppp)
INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/default RENAME accel-ppp)
+
endif (BUILD_DRIVER_ONLY)
diff --git a/cmake/debian/postinst b/cmake/debian/postinst
index a039b4f..5d516cd 100755
--- a/cmake/debian/postinst
+++ b/cmake/debian/postinst
@@ -2,7 +2,7 @@
chmod +x /etc/init.d/accel-ppp
-mkdir /var/log/accel-ppp &> /dev/null
-mkdir /var/run/accel-ppp &> /dev/null
+mkdir /var/log/accel-ppp > /dev/null 2>&1
+mkdir /var/run/accel-ppp > /dev/null 2>&1
exit 0