taken from upstream git From 1c5eaf9ca5cb03d4124d54b4178d4a2a47a724d7 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Oct 2010 18:29:16 +0200 Subject: [PATCH] Applied ddccontrol-libexecdir.patch --- .../GNOME_ddcc-applet.server.in.in | 2 +- src/gnome-ddcc-applet/Makefile.am | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in index f3a28ba..89a6615 100644 --- a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in +++ b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in @@ -2,7 +2,7 @@ + location="@appletdir@/ddcc-applet"> diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am index d16fbd0..6218efa 100644 --- a/src/gnome-ddcc-applet/Makefile.am +++ b/src/gnome-ddcc-applet/Makefile.am @@ -6,9 +6,10 @@ DDCC_LDADD = ../lib/libddccontrol.la EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml -pkglib_PROGRAMS = ddcc-applet -ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h +applet_PROGRAMS = ddcc-applet +appletdir = $(libexecdir) +ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD) AM_CFLAGS = $(GNOME_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"' @@ -18,10 +19,11 @@ serverdir = $(libdir)/bonobo/servers server_in_files = GNOME_ddcc-applet.server.in server_DATA = $(server_in_files:.server.in=.server) -$(server_in_files): $(server_in_files:.server.in=.server.in.in) - sed -e "s|\@PKGLIBDIR\@|$(pkglibdir)|" $< > $@ +$(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile + $(AM_V_GEN)sed \ + -e "s|\@appletdir\@|$(appletdir)|" \ + $< > $@ CLEANFILES = $(server_in_files) $(server_DATA) @INTLTOOL_SERVER_RULE@ - -- 1.7.4.1