Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/autogen.sh

@@ -3,9 +3,9 @@
 # Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
 mkdir -p m4
 
-HOOKS_DIR="`git rev-parse --git-dir`"/hooks
+HOOKS_DIR="../.git/hooks"
 # install pre-commit hook for doing clean commits
-if test ! \( -x ${HOOKS_DIR}/hooks/pre-commit -a -L ${HOOKS_DIR}/pre-commit \);
+if test ! \( -x ${HOOKS_DIR}/pre-commit -a -L ${HOOKS_DIR}/pre-commit \);
 then
     rm -f ${HOOKS_DIR}/pre-commit
     ln -s ${HOOKS_DIR}/pre-commit.sample ${HOOKS_DIR}/pre-commit