From 6c09cc6dfd90191db79019e1de14512f19d57d5d Mon Sep 17 00:00:00 2001 From: Emmanuel Milou <emilou@emilou-desktop.(none)> Date: Thu, 28 May 2009 14:57:57 -0400 Subject: [PATCH] =?UTF-8?q?[#1538]=20Apply=20Fran=C3=A7ois=20patches=20-?= =?UTF-8?q?=20debian=20packages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sflphone-client-gnome/sflphone.desktop.in | 1 - sflphone-client-gnome/src/Makefile.am | 4 ++-- sflphone-common/globals.mak | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sflphone-client-gnome/sflphone.desktop.in b/sflphone-client-gnome/sflphone.desktop.in index 2fde3130f2..f621e8a166 100644 --- a/sflphone-client-gnome/sflphone.desktop.in +++ b/sflphone-client-gnome/sflphone.desktop.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=SFLphone GNOME VoIP client GenericName=Telephone Comment=Call and receive calls with SIP or IAX protocols diff --git a/sflphone-client-gnome/src/Makefile.am b/sflphone-client-gnome/src/Makefile.am index fede093cac..a483cc3fc1 100644 --- a/sflphone-client-gnome/src/Makefile.am +++ b/sflphone-client-gnome/src/Makefile.am @@ -37,7 +37,7 @@ sflphone_client_gnome_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $( # add symbolic link install-exec-local: echo $(prefix); echo $(bindir); echo $(datadir); echo $(libdir) - cd $(bindir); ln -sf sflphone-client-gnome sflphone + cd $(DESTDIR)$(bindir); ln -sf sflphone-client-gnome sflphone uninstall-local: - -test -h $(bindir)/sflphone && rm $(bindir)/sflphone + -test -h $(DESTDIR)$(bindir)/sflphone && rm $(DESTDIR)$(bindir)/sflphone diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak index 820ab1f9e9..37607028c3 100644 --- a/sflphone-common/globals.mak +++ b/sflphone-common/globals.mak @@ -1,7 +1,7 @@ # Global variables src=$(top_srcdir) -sflcodecdir=$(libdir)/sflphone/codecs -sflplugindir=$(libdir)/sflphone/plugins +sflcodecdir=$(DESTDIR)$(libdir)/sflphone/codecs +sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins # for pjsip PJSIP_LIBS= \ -- GitLab