aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2015-02-26 22:55:25 +0100
committerPřemysl Janouch <p.janouch@gmail.com>2015-02-28 20:08:05 +0100
commit92f2339ef57e46dd9a7ff996ffe066518a40839d (patch)
tree9cbbfc471dcb7e6ada380b12527729fad7bf8870
parente141b364fe949f96b129b16aa28dc7456af50e9c (diff)
downloadxK-92f2339ef57e46dd9a7ff996ffe066518a40839d.tar.gz
xK-92f2339ef57e46dd9a7ff996ffe066518a40839d.tar.xz
xK-92f2339ef57e46dd9a7ff996ffe066518a40839d.zip
Miscellaneous tiny changes
-rw-r--r--.gitignore11
-rw-r--r--README15
2 files changed, 14 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 6d7c37d..6aef0ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
# Build files
-/zyklonb
-/kike
-/kike.msg
-/kike-replies.c
+/build
# Qt Creator files
-/ZyklonB.*
+/CMakeLists.txt.user*
+/ZyklonB.config
+/ZyklonB.files
+/ZyklonB.creator*
+/ZyklonB.includes
diff --git a/README b/README
index f70a3cc..34fad38 100644
--- a/README
+++ b/README
@@ -28,20 +28,21 @@ Some interesting features:
Building
--------
-Build dependencies: CMake, pkg-config, help2man, awk, sh, openssl
+Build dependencies: CMake, pkg-config, help2man, awk, sh
+Runtime dependencies: openssl
$ git clone https://github.com/pjanouch/ZyklonB.git
$ mkdir build
$ cd build
- $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+ $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug
$ make
To install the application, you can do either the usual:
- $ make install
+ # make install
Or you can try telling CMake to make a package for you. For Debian it is:
$ cpack -G DEB
- # dpkg -i sdtui-*.deb
+ # dpkg -i ZyklonB-*.deb
Note that for versions of CMake before 2.8.9, you need to prefix cpack with
`fakeroot' or file ownership will end up wrong.
@@ -57,9 +58,9 @@ doing that), simply run the appropriate program with no arguments:
$ zyklonb
$ kike
-ZyklonB stays running in the foreground, so I recommend launching it inside
-a Screen or tmux session. kike, on the other hand, immediately forks into the
-background. Use something like `killall' if you want to terminate it.
+ZyklonB stays running in the foreground, therefore I recommend launching it
+inside a Screen or tmux session. kike, on the other hand, immediately forks
+into the background. Use something like `killall' if you want to terminate it.
Client Certificates
-------------------