From ce831f93fe3fb94aac7251511d484bead784364d Mon Sep 17 00:00:00 2001 From: Huang Peng Date: Wed, 13 Aug 2008 16:09:09 +0800 Subject: [PATCH] Install programs in @bindir@ --- daemon/Makefile.am | 2 +- gconf/Makefile.am | 2 +- ibus.spec.in | 8 ++++---- panel/Makefile.am | 2 +- x11/Makefile.am | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 55b1919..312e6b6 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -34,7 +34,7 @@ ibusdaemon_PYTHON = \ register.py \ $(NULL) -libexec_SCRIPTS = ibus-daemon +bin_SCRIPTS = ibus-daemon ibusdaemondir = $(pkgdatadir)/daemon diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 5219ba0..3175bf2 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -26,7 +26,7 @@ gconf_PYTHON = \ gconfdir = $(pkgdatadir)/gconf -libexec_SCRIPTS = ibus-gconf +bin_SCRIPTS = ibus-gconf CLEANFILES = \ *.pyc \ diff --git a/ibus.spec.in b/ibus.spec.in index 3b50dc1..f8b4588 100644 --- a/ibus.spec.in +++ b/ibus.spec.in @@ -104,10 +104,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ibus/icons/* %{_datadir}/applications/* %{_datadir}/pixmaps/* -%{_libexecdir}/ibus-daemon -%{_libexecdir}/ibus-gconf -%{_libexecdir}/ibus-panel -%{_libexecdir}/ibus-x11 +%{_bindir}/ibus-daemon +%{_bindir}/ibus-gconf +%{_bindir}/ibus-panel +%{_bindir}/ibus-x11 %config %{_xinputconf} %files gtk diff --git a/panel/Makefile.am b/panel/Makefile.am index dde6529..6a09a7f 100644 --- a/panel/Makefile.am +++ b/panel/Makefile.am @@ -33,7 +33,7 @@ panel_PYTHON = \ paneldir = $(pkgdatadir)/panel -libexec_SCRIPTS = ibus-panel +bin_SCRIPTS = ibus-panel CLEANFILES = \ *.pyc \ diff --git a/x11/Makefile.am b/x11/Makefile.am index 4bf7ebf..25517cb 100644 --- a/x11/Makefile.am +++ b/x11/Makefile.am @@ -23,7 +23,7 @@ IMdkit = $(builddir)/IMdkit/libIMdkit.la libibus_gtk = $(top_builddir)/gtk2/libibus-gtk.la -libexec_PROGRAMS = ibus-x11 +bin_PROGRAMS = ibus-x11 ibus_x11_SOURCES = \ main.c \ -- 2.7.4