From 584d8677da543ff86ed2ceea19ad2fdcc3f760e6 Mon Sep 17 00:00:00 2001 From: handa Date: Fri, 26 Mar 2010 07:16:07 +0000 Subject: [PATCH] (pkgdatadir): Append @INSTSUBDIR@. --- FLT/Makefile.am | 3 +-- LANGDATA/Makefile.am | 2 +- MIM/Makefile.am | 2 +- icons/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/FLT/Makefile.am b/FLT/Makefile.am index f289f5d..076b4c5 100644 --- a/FLT/Makefile.am +++ b/FLT/Makefile.am @@ -49,5 +49,4 @@ FONT_LAYOUT_TABLE = \ COMBINING.flt \ NO-CTL.flt -pkgdatadir=$(datadir)/m17n - +pkgdatadir=$(datadir)/@INSTSUBDIR@ diff --git a/LANGDATA/Makefile.am b/LANGDATA/Makefile.am index 7191e33..80f204c 100644 --- a/LANGDATA/Makefile.am +++ b/LANGDATA/Makefile.am @@ -21,7 +21,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -pkgdatadir=$(datadir)/m17n +pkgdatadir=$(datadir)/@INSTSUBDIR@ TABLES=@LANGNAME_TABLES@ diff --git a/MIM/Makefile.am b/MIM/Makefile.am index 6b1f443..c11531f 100644 --- a/MIM/Makefile.am +++ b/MIM/Makefile.am @@ -79,4 +79,4 @@ INPUT_METHOD = \ ispell.mimx \ global.mimx cjk-util.mimx zh-util.mimx -pkgdatadir=$(datadir)/m17n +pkgdatadir=$(datadir)/@INSTSUBDIR@ diff --git a/icons/Makefile.am b/icons/Makefile.am index 629b482..a73d39a 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -22,6 +22,6 @@ # Boston, MA 02110-1301, USA. pkgdata_DATA = @ICONS@ -pkgdatadir=$(datadir)/m17n/icons +pkgdatadir=$(datadir)/@INSTSUBDIR@/icons EXTRA_DIST = @ICONS@ -- 1.7.10.4