From c4a88fb459164fb5adabd873c0ae5d8b4954c445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Tue, 9 Aug 2011 17:55:46 +0200
Subject: [PATCH] Install KissCount into /usr/local instead of /usr

---
 ChangeLog  |  7 +++++++
 Makefile   | 11 ++++++-----
 install.sh |  7 ++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ff45129..7d68969 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+v0.3 (06/08/2011)
+** User **
+	Install KissCount into /usr/local instead of /usr
+
+** Bugs **
+	Fix a bug in language settings
+
 v0.2 (04/07/2011)
 
 ** User **
diff --git a/Makefile b/Makefile
index 19eb0fa..673f18f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
-LIB_DIR=$(DESTDIR)"/usr/lib/kisscount/"
-SHARE_DIR=$(DESTDIR)"/usr/share/kisscount/"
-DOC_DIR=$(DESTDIR)"/usr/share/doc/kisscount/"
-BIN_DIR=$(DESTDIR)"/usr/bin/"
+ROOT_DIR="/usr/local"
+LIB_DIR=$(DESTDIR)$(ROOT_DIR)"/lib/kisscount/"
+SHARE_DIR=$(DESTDIR)$(ROOT_DIR)"/share/kisscount/"
+DOC_DIR=$(DESTDIR)$(ROOT_DIR)"/share/doc/kisscount/"
+BIN_DIR=$(DESTDIR)$(ROOT_DIR)"/bin/"
 
 CXXFLAGS+=`wx-config --cxxflags` -Wall -Isrc -ggdb
 CXXFLAGS+=-I./lib/wxsqlite3-1.9.9/include
@@ -59,7 +60,7 @@ endif
 install:
 	mkdir -p $(LIB_DIR) $(BIN_DIR) $(SHARE_DIR) $(DOC_DIR)
 	cp kc $(BIN_DIR)
-	cp -rf lib/*.so* $(LIB_DIR)
+	find lib -name '*.so*' -exec cp -rf \{\} $(LIB_DIR) \;
 	cp -rf ressources/* $(SHARE_DIR)
 	cp -rf README* ChangeLog CONTRIBUTORS COPYING TODO $(DOC_DIR)
 
diff --git a/install.sh b/install.sh
index f63289c..d59f050 100755
--- a/install.sh
+++ b/install.sh
@@ -19,9 +19,10 @@
 # You should have received a copy of the GNU General Public License
 # along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 
-SHARE_DIR=/usr/share/kisscount
-LIB_DIR=/usr/lib/kisscount
-BIN_DIR=/usr/bin
+ROOT_DIR=/usr/local
+SHARE_DIR=$ROOT_DIR/share/kisscount
+LIB_DIR=$ROOT_DIR/lib/kisscount
+BIN_DIR=$ROOT_DIR/bin
 
 case "$1" in
     --install|-i)