[gnome-shell-extensions] gnome-classic.session: fix @libexecdir@ substitution
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions] gnome-classic.session: fix @libexecdir@ substitution
- Date: Mon, 10 Dec 2012 23:54:56 +0000 (UTC)
commit 02989fd0f7a9f6de133ae5406d797aaf3044426d
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Dec 6 00:07:15 2012 -0500
gnome-classic.session: fix @libexecdir@ substitution
The Makefile had two rules by which it could possibly have generated the
intermediate .in file (on the way from .in.in to .session) and it picked
the one that didn't contain the substitution for @libexecdir
Consolidate the rules into one that does all the needed substitutions.
https://bugzilla.gnome.org/show_bug.cgi?id=689756
data/Makefile.am | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index d9f4561..4744566 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -20,6 +20,7 @@ mode_DATA = $(mode_in_files:.json.in=.json)
%.desktop.in:%.desktop.in.in
$(AM_V_GEN) sed \
+ -e "s|\ libexecdir\@|$(libexecdir)|" \
-e "s|\ bindir\@|$(bindir)|" \
-e "s|\ VERSION\@|$(VERSION)|" \
$< > $@
@@ -34,11 +35,6 @@ extension_list:=$(subst $(space),$(comma),$(extensions))
-e "s|\ CLASSIC_EXTENSIONS\@|$(extension_list)|g" \
$< > $@
-%.session.desktop.in: %.session.desktop.in.in
- $(AM_V_GEN) sed \
- -e "s|\ libexecdir\@|$(libexecdir)|" \
- $< > $@
-
%.session: %.session.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
@INTLTOOL_DESKTOP_RULE@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]