patches for 1.5.4


(obache)

$NetBSD: patch-bus_Makefile.in,v 1.1 2013/10/23 11:52:50 obache Exp $

* honor $(mandir)

--- bus/Makefile.in.orig	2013-09-20 03:17:23.000000000 +0000
+++ bus/Makefile.in
@@ -811,7 +811,7 @@ CLEANFILES = \
 man_one_in_files = ibus-daemon.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
 man_one_DATA = $(man_one_files:.1=.1.gz) 
-man_onedir = $(datadir)/man/man1
+man_onedir = $(mandir)/man1
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 

$NetBSD: patch-setup_Makefile.in,v 1.1 2013/10/23 11:52:50 obache Exp $

* honor $(mandir)

--- setup/Makefile.in.orig	2013-09-20 03:17:27.000000000 +0000
+++ setup/Makefile.in
@@ -441,7 +441,7 @@ desktopdir = $(datadir)/applications
 man_one_in_files = ibus-setup.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
 man_one_DATA = $(man_one_files:.1=.1.gz) 
-man_onedir = $(datadir)/man/man1
+man_onedir = $(mandir)/man1
 CLEANFILES = \
 	$(man_one_DATA) \
 	$(man_one_files) \

$NetBSD: patch-tools_Makefile.in,v 1.1 2013/10/23 11:52:50 obache Exp $

* honor $(mandir)

--- tools/Makefile.in.orig	2013-09-20 03:17:27.000000000 +0000
+++ tools/Makefile.in
@@ -526,7 +526,7 @@ bash_completiondir = @datadir@/bash-comp
 man_one_in_files = ibus.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
 man_one_DATA = $(man_one_files:.1=.1.gz) 
-man_onedir = $(datadir)/man/man1
+man_onedir = $(mandir)/man1
 EXTRA_DIST = \
 	$(man_one_in_files) \
 	ibus.bash \