[mousetrap] Fixed autotools installation

[Flavio Percoco <flaper src gnome org>]

commit 511a93d73c1189a5e30da0e7df4ba6532e6fe6e6
Author: Flavio Percoco Premoli <flaper87 gmail com>
Date:   Mon Jun 1 04:49:30 2009 +0200

    Fixed autotools installation
---
 configure.in                         |   10 +++++-----
 src/mousetrap/Makefile.am            |    4 ++++
 src/mousetrap/lib/Makefile.am        |    2 ++
 src/mousetrap/lib/settings.py        |    2 +-
 src/mousetrap/ui/scripts/Makefile.am |    1 +
 src/ocvfw/Makefile.am                |    9 ++++++---
 src/ocvfw/dev/Makefile.am            |    6 +++---
 src/ocvfw/haars/Makefile.am          |    6 +++---
 src/ocvfw/idm/Makefile.am            |    6 +++---
 9 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/configure.in b/configure.in
index 78a47ef..1038c1a 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(ChangeLog)
 
 
 CURRENT_DIR=$PWD
-MOUSETRAP_VERSION=0.3
+MOUSETRAP_VERSION=0.4
 AM_INIT_AUTOMAKE(mousetrap, $MOUSETRAP_VERSION)
 AC_SUBST(MOUSETRAP_VERSION)
 AC_SUBST(CURRENT_DIR)
@@ -31,7 +31,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 AM_GLIB_GNU_GETTEXT
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 
 dnl Checks for programs
 AC_PROG_CC
@@ -44,7 +44,7 @@ AM_PROG_LIBTOOL
 
 # Check for Python
 
-AM_PATH_PYTHON(2.4)
+AM_PATH_PYTHON(2.6)
 
 # Find the headers needed to build extensions
 
@@ -70,9 +70,9 @@ DOCBOOK_CHECK()
 #mousetrap.spec
 
 AC_OUTPUT([
+run_pylint.sh
 Makefile
 mousetrap.desktop
-run_pylint.sh
 po/Makefile.in
 docs/Makefile
 docs/man/Makefile
@@ -93,4 +93,4 @@ src/ocvfw/Makefile
 src/ocvfw/dev/Makefile
 src/ocvfw/idm/Makefile
 src/ocvfw/haars/Makefile
-])
+],[chmod +x run_pylint.sh])
diff --git a/src/mousetrap/Makefile.am b/src/mousetrap/Makefile.am
index 8d142d2..3ca12d6 100755
--- a/src/mousetrap/Makefile.am
+++ b/src/mousetrap/Makefile.am
@@ -8,6 +8,7 @@ mousetrap_pathdir=$(pyexecdir)
 
 mousetrap_python_PYTHON = \
 	environment.py \
+	debug.py \
 	__init__.py \
 	mousetrap.py
 
@@ -15,3 +16,6 @@ mousetrap_python_PYTHON = \
 SUBDIRS = lib ui
 
 mousetrap_pythondir=$(pyexecdir)/mousetrap
+
+install-exec-hook:
+	chmod a+rx $(mousetrap_pythondir) -R
diff --git a/src/mousetrap/lib/Makefile.am b/src/mousetrap/lib/Makefile.am
index bb13a21..19cf87a 100755
--- a/src/mousetrap/lib/Makefile.am
+++ b/src/mousetrap/lib/Makefile.am
@@ -8,3 +8,5 @@ mousetrap_python_PYTHON = \
 	__init__.py
 
 mousetrap_pythondir=$(pyexecdir)/mousetrap/lib
+
+
diff --git a/src/mousetrap/lib/settings.py b/src/mousetrap/lib/settings.py
index b3767fb..161a1d3 100755
--- a/src/mousetrap/lib/settings.py
+++ b/src/mousetrap/lib/settings.py
@@ -72,7 +72,7 @@ def load():
     cfg = Settings()
     if not os.path.exists( env.configPath ):
         os.mkdir( env.configPath )
-        cfg.write_first()
+        cfg.write_first(env.configFile)
 
     if not os.path.exists( env.configFile ):
         cfg.write_first(env.configFile)
diff --git a/src/mousetrap/ui/scripts/Makefile.am b/src/mousetrap/ui/scripts/Makefile.am
index 1ff853a..31b4502 100755
--- a/src/mousetrap/ui/scripts/Makefile.am
+++ b/src/mousetrap/ui/scripts/Makefile.am
@@ -5,3 +5,4 @@ mousetrap_python_PYTHON = \
 	__init__.py
 
 mousetrap_pythondir=$(pyexecdir)/mousetrap/ui/scripts
+
diff --git a/src/ocvfw/Makefile.am b/src/ocvfw/Makefile.am
index a8fccde..9936ada 100755
--- a/src/ocvfw/Makefile.am
+++ b/src/ocvfw/Makefile.am
@@ -1,6 +1,6 @@
-mousetrap_pathdir=$(pyexecdir)
+ocvfw_pathdir=$(pyexecdir)
 
-mousetrap_python_PYTHON = \
+ocvfw_python_PYTHON = \
 	debug.py \
 	pocv.py \
 	commons.py \
@@ -10,4 +10,7 @@ mousetrap_python_PYTHON = \
 
 SUBDIRS = dev haars idm
 
-mousetrap_pythondir=$(pyexecdir)/ocvfw
+ocvfw_pythondir=$(pyexecdir)/ocvfw
+
+install-exec-hook:
+	chmod a+rx $(ocvfw_pythondir) -R
diff --git a/src/ocvfw/dev/Makefile.am b/src/ocvfw/dev/Makefile.am
index 8248bdc..8b28ae8 100755
--- a/src/ocvfw/dev/Makefile.am
+++ b/src/ocvfw/dev/Makefile.am
@@ -1,7 +1,7 @@
-mousetrap_pathdir=$(pyexecdir)
+ocvfw_pathdir=$(pyexecdir)
 
-mousetrap_python_PYTHON = \
+ocvfw_python_PYTHON = \
 	camera.py \
 	__init__.py
 
-mousetrap_pythondir=$(pyexecdir)/ocvfw/dev
+ocvfw_pythondir=$(pyexecdir)/ocvfw/dev
diff --git a/src/ocvfw/haars/Makefile.am b/src/ocvfw/haars/Makefile.am
index 3a70709..6cf25a1 100755
--- a/src/ocvfw/haars/Makefile.am
+++ b/src/ocvfw/haars/Makefile.am
@@ -1,6 +1,6 @@
-mouseTrap_pathdir=$(pyexecdir)
+ocvfw_pathdir=$(pyexecdir)
 
-mouseTrap_python_PYTHON = \
+ocvfw_python_PYTHON = \
 	frontalEyes35x16.xml \
 	haarcascade_frontalface_alt2.xml \
 	haarcascade_frontalface_alt_tree.xml \
@@ -9,4 +9,4 @@ mouseTrap_python_PYTHON = \
 	haarcascade_eye_tree_eyeglasses.xml \
 	Mouth.xml
 
-mouseTrap_pythondir=$(pyexecdir)/ocvfw/haars
+ocvfw_pythondir=$(pyexecdir)/ocvfw/haars
diff --git a/src/ocvfw/idm/Makefile.am b/src/ocvfw/idm/Makefile.am
index 64cff53..9d3a205 100755
--- a/src/ocvfw/idm/Makefile.am
+++ b/src/ocvfw/idm/Makefile.am
@@ -1,7 +1,7 @@
-mousetrap_pathdir=$(pyexecdir)
+ocvfw_pathdir=$(pyexecdir)
 
-mousetrap_python_PYTHON = \
+ocvfw_python_PYTHON = \
 	forehead.py \
 	__init__.py
 
-mousetrap_pythondir=$(pyexecdir)/ocvfw/idm
+ocvfw_pythondir=$(pyexecdir)/ocvfw/idm