|
 |
e1b0f3 |
From 1cb5032e85d85f496e349236d1b74f17fb8db966 Mon Sep 17 00:00:00 2001
|
|
|
e1b0f3 |
From: fujiwarat <takao.fujiwara1@gmail.com>
|
|
|
e1b0f3 |
Date: Tue, 23 Apr 2019 15:40:45 +0900
|
|
|
e1b0f3 |
Subject: [PATCH] configure: Move ibus-setup from configure.ac to Makefile.am
|
|
|
e1b0f3 |
|
|
|
e1b0f3 |
@localedir@ can be extracted to ${datarootdir}/locale and
|
|
|
e1b0f3 |
it needs datarootdir=/usr/share in case configure.ac is used
|
|
|
e1b0f3 |
and deleting the datarootdir line caused a regression.
|
|
|
e1b0f3 |
All variables can be extracted in Makefile.am with sed.
|
|
|
e1b0f3 |
---
|
|
|
e1b0f3 |
configure.ac | 1 -
|
|
|
e1b0f3 |
setup/Makefile.am | 13 +++++++++++--
|
|
|
e1b0f3 |
2 files changed, 11 insertions(+), 3 deletions(-)
|
|
|
e1b0f3 |
|
|
|
e1b0f3 |
diff --git a/configure.ac b/configure.ac
|
|
|
e1b0f3 |
index 9518e808..7503f3e8 100644
|
|
|
e1b0f3 |
--- a/configure.ac
|
|
|
e1b0f3 |
+++ b/configure.ac
|
|
|
e1b0f3 |
@@ -724,7 +724,6 @@ ibus/interface/Makefile
|
|
|
e1b0f3 |
ui/Makefile
|
|
|
e1b0f3 |
ui/gtk3/Makefile
|
|
|
e1b0f3 |
setup/Makefile
|
|
|
e1b0f3 |
-setup/ibus-setup
|
|
|
e1b0f3 |
bindings/Makefile
|
|
|
e1b0f3 |
bindings/pygobject/Makefile
|
|
|
e1b0f3 |
bindings/vala/Makefile
|
|
|
e1b0f3 |
diff --git a/setup/Makefile.am b/setup/Makefile.am
|
|
|
e1b0f3 |
index cb4dd8d1..34c8f136 100644
|
|
|
e1b0f3 |
--- a/setup/Makefile.am
|
|
|
e1b0f3 |
+++ b/setup/Makefile.am
|
|
|
e1b0f3 |
@@ -3,8 +3,8 @@
|
|
|
e1b0f3 |
# ibus - The Input Bus
|
|
|
e1b0f3 |
#
|
|
|
e1b0f3 |
# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
|
|
|
e1b0f3 |
-# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
|
|
|
e1b0f3 |
-# Copyright (c) 2007-2017 Red Hat, Inc.
|
|
|
e1b0f3 |
+# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
|
|
|
e1b0f3 |
+# Copyright (c) 2007-2019 Red Hat, Inc.
|
|
|
e1b0f3 |
#
|
|
|
e1b0f3 |
# This library is free software; you can redistribute it and/or
|
|
|
e1b0f3 |
# modify it under the terms of the GNU Lesser General Public
|
|
|
e1b0f3 |
@@ -40,6 +40,15 @@ ibussetup_DATA = \
|
|
|
e1b0f3 |
bin_SCRIPTS = ibus-setup
|
|
|
e1b0f3 |
ibussetupdir = $(pkgdatadir)/setup
|
|
|
e1b0f3 |
|
|
|
e1b0f3 |
+ibus-setup: ibus-setup.in
|
|
|
e1b0f3 |
+ $(AM_V_GEN) sed -e "s|\@datarootdir\@|$(datarootdir)|g" \
|
|
|
e1b0f3 |
+ -e "s|\@localedir\@|$(localedir)|g" \
|
|
|
e1b0f3 |
+ -e "s|\@libexecdir\@|$(libexecdir)|g" \
|
|
|
e1b0f3 |
+ -e "s|\@prefix\@|$(prefix)|g" \
|
|
|
e1b0f3 |
+ -e "s|\@PYTHON\@|$(PYTHON)|g" \
|
|
|
e1b0f3 |
+ $< > $@.tmp && \
|
|
|
e1b0f3 |
+ mv $@.tmp $@
|
|
|
e1b0f3 |
+
|
|
|
e1b0f3 |
desktop_in_files = ibus-setup.desktop.in
|
|
|
e1b0f3 |
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
|
|
e1b0f3 |
desktopdir = $(datadir)/applications
|
|
|
e1b0f3 |
--
|
|
|
e1b0f3 |
2.21.0
|
|
|
e1b0f3 |
|