[Pkg-privacy-commits] [irssi-plugin-otr] 159/267: Fix: install the module system wide

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository irssi-plugin-otr.

commit dd844861365346c611f1ecb286339ca661d6413c
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Thu Nov 29 13:11:01 2012 -0500

    Fix: install the module system wide
    
    Irssi only loads module in /usr/lib/irssi/modules or in
    $HOME/.irssi/modules so we force here the install location. This is a
    bit sad since it might not be the correct path on some distros.
    
    Anyhow, if "/usr/lib/irssi/modules" does not exists, a mkdir -p is done
    than the module is copied there.
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 configure.ac    | 16 ++++++----------
 src/Makefile.am |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7770827..ce03fcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,12 +69,10 @@ CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_S
 DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include"
 AC_SUBST(DEFAULT_INCLUDES)
 
-if test -n "$HOME"; then
-	IRSSI_MODULE_DIR="$HOME/.irssi/modules"
-	AC_SUBST(IRSSI_MODULE_DIR)
-else
-	AC_MSG_ERROR([Unable to find Irssi directory. The HOME variable is unset.])
-fi
+# Hardcoded here since irssi only searches in $HOME/.irssi/modules or this path
+# which is unfortunate...
+IRSSI_MODULE_DIR="/usr/lib/irssi/modules"
+AC_SUBST(IRSSI_MODULE_DIR)
 
 AC_CONFIG_FILES([
 	Makefile
@@ -104,8 +102,6 @@ AS_ECHO($target_arch)
 
 # Print the bindir and libdir this `make install' will install into.
 AS_ECHO()
-AS_ECHO_N("Binaries will be installed in:  ")
-AS_ECHO("`eval eval echo $bindir`")
-AS_ECHO_N("Libraries will be installed in: ")
-AS_ECHO("`eval eval echo $libdir`")
+AS_ECHO_N("Module will be installed in: ")
+AS_ECHO("`eval eval echo $IRSSI_MODULE_DIR`")
 AS_ECHO()
diff --git a/src/Makefile.am b/src/Makefile.am
index 034069c..083e496 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,4 +29,4 @@ install-exec-hook:
 install-data-hook:
 	rm $(plugindir)/otr.la
 	mv $(plugindir)/otr.so $(plugindir)/libotr.so
-	chmod 700 $(plugindir)/libotr.so
+	chmod 644 $(plugindir)/libotr.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git