summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--library/CMakeLists.txt8
-rwxr-xr-xpackage/ubuntu-10.10/postinst3
2 files changed, 8 insertions, 3 deletions
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 1e7688b4..4c0a4a74 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -204,9 +204,11 @@ install(TARGETS dfhack
install(FILES ${CMAKE_SOURCE_DIR}/Memory.xml
DESTINATION ${DFHACK_DATA_DESTINATION}) #linux: share/dfhack
-if(WIN32 AND BUILD_DFHACK_DEVEL)
- install(TARGETS dfhack
- ARCHIVE DESTINATION ${DFHACK_DEVLIB_DESTINATION})
+if(BUILD_DFHACK_DEVEL)
+ if(WIN32)
+ install(TARGETS dfhack
+ ARCHIVE DESTINATION ${DFHACK_DEVLIB_DESTINATION})
+ endif()
install(DIRECTORY ${CMAKE_SOURCE_DIR}/library/include/
DESTINATION ${DFHACK_INCLUDES_DESTINATION}
FILES_MATCHING PATTERN "*.h" ) #linux: include
diff --git a/package/ubuntu-10.10/postinst b/package/ubuntu-10.10/postinst
index ff117e8e..a628ada3 100755
--- a/package/ubuntu-10.10/postinst
+++ b/package/ubuntu-10.10/postinst
@@ -1,4 +1,7 @@
#!/bin/sh
echo "Setting required kernel parameters."
+# I actually do it three times, hoping to hammer this into Ubuntu's dense skull.
sysctl -w kernel.randomize_va_space=0
sysctl -w kernel.yama.ptrace_scope=0
+echo "kernel.randomize_va_space=0" >> /etc/sysctl.conf
+echo "kernel.yama.ptrace_scope=0" >> /etc/sysctl.conf \ No newline at end of file