From 2dcceee3173e16e8122610aded055f01a464dcbd Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Wed, 29 Nov 2006 08:07:41 +0000
Subject: [PATCH] [Fab] install gajim-remote only if dbus is present. see #2723
---
Makefile.am | 14 +++++++++++---
configure.ac | 1 +
scripts/{gajim-remote => gajim-remote.in} | 9 ++++++---
3 files changed, 18 insertions(+), 6 deletions(-)
rename scripts/{gajim-remote => gajim-remote.in} (88%)
mode change 100755 => 100644
diff --git a/Makefile.am b/Makefile.am
index bf680095be..50329095c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,13 @@ SUBDIRS = src data po
ACLOCAL_AMFLAGS = -I m4
-bin_SCRIPTS = scripts/gajim
+if BUILD_REMOTE_CONTROL
+OPTIONAL_BIN = scripts/gajim-remote
+else
+OPTIONAL_BIN =
+endif
+
+bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN)
docfilesdir = $(docdir)
@@ -19,13 +25,15 @@ EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
- scripts/gajim.in
+ scripts/gajim.in \
+ scripts/gajim-remote.in
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
- scripts/gajim
+ scripts/gajim \
+ scripts/gajim-remote
MAINTAINERCLEANFILES = \
configure \
diff --git a/configure.ac b/configure.ac
index 79ccabff8f..8cdde026db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,7 @@ AC_CONFIG_FILES([
src/Makefile
src/common/Makefile
scripts/gajim
+ scripts/gajim-remote
po/Makefile.in
])
AC_OUTPUT
diff --git a/scripts/gajim-remote b/scripts/gajim-remote.in
old mode 100755
new mode 100644
similarity index 88%
rename from scripts/gajim-remote
rename to scripts/gajim-remote.in
index 4b2a762cb7..f107fe4285
--- a/scripts/gajim-remote
+++ b/scripts/gajim-remote.in
@@ -28,6 +28,9 @@ if [ `id -u` -eq 0 ]; then
echo "You must not launch gajim-remote as root, it is INSECURE"
fi
-cd PREFIX/share/gajim/src
-export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim"
-exec PYTHON_EXEC -OO gajim-remote.py "$@"
+datadir=@DATADIR@
+PYTHON_EXEC=@PYTHON@
+
+cd ${datadir}/gajim/src
+export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
+exec ${PYTHON_EXEC} -OO gajim-remote.py "$@"
--
GitLab