From b00bff7f14f26076f022f9f57dcba57b7c0ae983 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 1 Aug 2005 09:00:18 +0000 Subject: [PATCH] scripts now look for libs in the correct folder --- Makefile | 4 ++-- scripts/gajim | 2 +- scripts/gajim-remote | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2696debc1..637a274a1 100644 --- a/Makefile +++ b/Makefile @@ -81,9 +81,9 @@ install: for s in $(SCRIPTS) ; do \ BASE=`basename "$$s"`; \ if [ $(GAJIM_AP) -ne 0 ] ; then \ - F=`cat "$$s"`; \ + F=`cat "$$s" | sed -e 's!LIB!$(LIBDIR)!g'`; \ else \ - F=`cat "$$s" | sed -e 's!PREFIX!$(PREFIX)!g'`; \ + F=`cat "$$s" | sed -e 's!PREFIX!$(PREFIX)!g' -e 's!LIB!$(LIBDIR)!g'`; \ fi; \ echo "$$F" > "$(DESTDIR)$(PREFIX)/bin/$$BASE"; \ chmod +x "$(DESTDIR)$(PREFIX)/bin/$$BASE"; \ diff --git a/scripts/gajim b/scripts/gajim index 0a618a8e9..690b0b4ad 100644 --- a/scripts/gajim +++ b/scripts/gajim @@ -22,5 +22,5 @@ if [ `id -u` -eq 0 ]; then fi cd PREFIX/share/gajim/src -export PYTHONPATH="$PYTHONPATH:PREFIX/lib/gajim" +export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim" python gajim.py $@ diff --git a/scripts/gajim-remote b/scripts/gajim-remote index 0e2e73b78..1bf972144 100644 --- a/scripts/gajim-remote +++ b/scripts/gajim-remote @@ -23,5 +23,5 @@ if [ `id -u` -eq 0 ]; then fi cd PREFIX/share/gajim/scripts -export PYTHONPATH="$PYTHONPATH:PREFIX/lib/gajim" +export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim" python gajim-remote.py $@