From d220ab78c914a51b3cdc8842b47685dd2600985c Mon Sep 17 00:00:00 2001 From: sniperbeamer Date: Tue, 4 Mar 2008 17:57:59 +0000 Subject: [PATCH] Fixed SF Bug #1905810 Updated install instructions git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@168 b624d157-de02-0410-bad0-e51aec6abb33 --- INSTALL | 2 +- src/crypto/aes_tdefs.h | 2 +- src/src.pro | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index 60ba87b..097aeac 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation instructions for *nix: ----------------------------------- 1. qmake-qt4 / qmake - You have to use qmake of Qt >= 4.2.0, depending on your distro it is called qmake or qmake-qt4. + You have to use qmake of Qt >= 4.3.0, depending on your distro it is called qmake or qmake-qt4. By default KeePassX is installed to /usr, you can change that by adding PREFIX=[PATH] to the qmake command. You can also add DEBUG=1 to build KeePassX with debug symbols. 2. make diff --git a/src/crypto/aes_tdefs.h b/src/crypto/aes_tdefs.h index 3ba9d0b..89412b8 100644 --- a/src/crypto/aes_tdefs.h +++ b/src/crypto/aes_tdefs.h @@ -55,7 +55,7 @@ extern "C" #elif ULONG_MAX == 0xfffffffful typedef unsigned long uint_32t; #elif defined( _CRAY ) -# error This code needs 32-bit data types, which Cray machines don't provide +# error This code needs 32-bit data types, which Cray machines do not provide #else # error Please define uint_32t as a 32-bit unsigned integer type in tdefs.h #endif diff --git a/src/src.pro b/src/src.pro index 05c7ef1..e081d32 100644 --- a/src/src.pro +++ b/src/src.pro @@ -32,8 +32,8 @@ unix : !macx : !isEqual(QMAKE_WIN32,1) { } TARGET = ../bin/keepassx target.path = $${PREFIX}/bin - data.files += ../share/keepassx/* - data.path = $${PREFIX}/share/keepassx + data.files += ../share/keepassx + data.path = $${PREFIX}/share pixmaps.files = ../share/pixmaps/* pixmaps.path = $${PREFIX}/share/pixmaps desktop.files = ../share/applications/*