diff options
58 files changed, 120 insertions, 57 deletions
@@ -1,3 +1,66 @@ +2005-09-01 Kristian Høgsberg <krh@redhat.com> + + * nls/C/Makefile.am: + * nls/Makefile.am: + * nls/armscii-8/Makefile.am: + * nls/en_US.UTF-8/Makefile.am: + * nls/georgian-academy/Makefile.am: + * nls/georgian-ps/Makefile.am: + * nls/ibm-cp1133/Makefile.am: + * nls/iscii-dev/Makefile.am: + * nls/isiri-3342/Makefile.am: + * nls/iso8859-1/Makefile.am: + * nls/iso8859-10/Makefile.am: + * nls/iso8859-11/Makefile.am: + * nls/iso8859-13/Makefile.am: + * nls/iso8859-14/Makefile.am: + * nls/iso8859-15/Makefile.am: + * nls/iso8859-2/Makefile.am: + * nls/iso8859-3/Makefile.am: + * nls/iso8859-4/Makefile.am: + * nls/iso8859-5/Makefile.am: + * nls/iso8859-6/Makefile.am: + * nls/iso8859-7/Makefile.am: + * nls/iso8859-8/Makefile.am: + * nls/iso8859-9/Makefile.am: + * nls/iso8859-9e/Makefile.am: + * nls/ja.JIS/Makefile.am: + * nls/ja.S90/Makefile.am: + * nls/ja.SJIS/Makefile.am: + * nls/ja.U90/Makefile.am: + * nls/ja/Makefile.am: + * nls/ja_JP.UTF-8/Makefile.am: + * nls/ko/Makefile.am: + * nls/ko_KR.UTF-8/Makefile.am: + * nls/koi8-c/Makefile.am: + * nls/koi8-r/Makefile.am: + * nls/koi8-u/Makefile.am: + * nls/microsoft-cp1251/Makefile.am: + * nls/microsoft-cp1255/Makefile.am: + * nls/microsoft-cp1256/Makefile.am: + * nls/mulelao-1/Makefile.am: + * nls/nokhchi-1/Makefile.am: + * nls/pt_BR.UTF-8/Makefile.am: + * nls/tatar-cyr/Makefile.am: + * nls/th_TH.UTF-8/Makefile.am: + * nls/th_TH/Makefile.am: + * nls/tscii-0/Makefile.am: + * nls/vi_VN.tcvn/Makefile.am: + * nls/vi_VN.viscii/Makefile.am: + * nls/zh_CN.UTF-8/Makefile.am: + * nls/zh_CN.gb18030/Makefile.am: + * nls/zh_CN.gbk/Makefile.am: + * nls/zh_CN/Makefile.am: + * nls/zh_HK.UTF-8/Makefile.am: + * nls/zh_HK.big5/Makefile.am: + * nls/zh_HK.big5hkscs/Makefile.am: + * nls/zh_TW.UTF-8/Makefile.am: + * nls/zh_TW.big5/Makefile.am: + * nls/zh_TW/Makefile.am: + + Use $(X11_LOCALEDATADIR) instead of @X11_LOCALEDATADIR@ so this + install destination can be overridden at make install time. + 2005-08-21 Matthieu Herrb <matthieu.herrb@laas.fr> * configure.ac: diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am index a08a0a02..c4826e2e 100644 --- a/nls/C/Makefile.am +++ b/nls/C/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/C +x11thislocaledir = $(X11_LOCALEDATADIR)/C include $(top_srcdir)/nls/localerules.in diff --git a/nls/Makefile.am b/nls/Makefile.am index 756bff22..6a5754a2 100644 --- a/nls/Makefile.am +++ b/nls/Makefile.am @@ -1,4 +1,4 @@ -x11localedir = @X11_LOCALEDATADIR@ +x11localedir = $(X11_LOCALEDATADIR) EXTRA_DIST = locale.alias.pre compose.dir.pre diff --git a/nls/armscii-8/Makefile.am b/nls/armscii-8/Makefile.am index 09735957..45b00e74 100644 --- a/nls/armscii-8/Makefile.am +++ b/nls/armscii-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/armscii-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/armscii-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/en_US.UTF-8/Makefile.am b/nls/en_US.UTF-8/Makefile.am index 906ac1c9..c364315a 100644 --- a/nls/en_US.UTF-8/Makefile.am +++ b/nls/en_US.UTF-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/en_US.UTF-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/georgian-academy/Makefile.am b/nls/georgian-academy/Makefile.am index 80c01695..a1340cf8 100644 --- a/nls/georgian-academy/Makefile.am +++ b/nls/georgian-academy/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/georgian-academy +x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-academy include $(top_srcdir)/nls/localerules.in diff --git a/nls/georgian-ps/Makefile.am b/nls/georgian-ps/Makefile.am index 8c9b69d3..fc85c823 100644 --- a/nls/georgian-ps/Makefile.am +++ b/nls/georgian-ps/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/georgian-ps +x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-ps include $(top_srcdir)/nls/localerules.in diff --git a/nls/ibm-cp1133/Makefile.am b/nls/ibm-cp1133/Makefile.am index cfa71309..5ecced23 100644 --- a/nls/ibm-cp1133/Makefile.am +++ b/nls/ibm-cp1133/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ibm-cp1133 +x11thislocaledir = $(X11_LOCALEDATADIR)/ibm-cp1133 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iscii-dev/Makefile.am b/nls/iscii-dev/Makefile.am index 9e41e695..21e31e23 100644 --- a/nls/iscii-dev/Makefile.am +++ b/nls/iscii-dev/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iscii-dev +x11thislocaledir = $(X11_LOCALEDATADIR)/iscii-dev include $(top_srcdir)/nls/localerules.in diff --git a/nls/isiri-3342/Makefile.am b/nls/isiri-3342/Makefile.am index e3f83a07..103d9c9f 100644 --- a/nls/isiri-3342/Makefile.am +++ b/nls/isiri-3342/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/isiri-3342 +x11thislocaledir = $(X11_LOCALEDATADIR)/isiri-3342 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-1/Makefile.am b/nls/iso8859-1/Makefile.am index f64d20aa..e689716b 100644 --- a/nls/iso8859-1/Makefile.am +++ b/nls/iso8859-1/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-1 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-1 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-10/Makefile.am b/nls/iso8859-10/Makefile.am index f0b7a8a2..871cdf16 100644 --- a/nls/iso8859-10/Makefile.am +++ b/nls/iso8859-10/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-10 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-10 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-11/Makefile.am b/nls/iso8859-11/Makefile.am index cb778d10..391c4c4e 100644 --- a/nls/iso8859-11/Makefile.am +++ b/nls/iso8859-11/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-11 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-11 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-13/Makefile.am b/nls/iso8859-13/Makefile.am index f204431d..2635ce95 100644 --- a/nls/iso8859-13/Makefile.am +++ b/nls/iso8859-13/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-13 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-13 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-14/Makefile.am b/nls/iso8859-14/Makefile.am index 2b80faea..fa68e42f 100644 --- a/nls/iso8859-14/Makefile.am +++ b/nls/iso8859-14/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-14 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-14 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-15/Makefile.am b/nls/iso8859-15/Makefile.am index 5fa6ac12..f6f5fee9 100644 --- a/nls/iso8859-15/Makefile.am +++ b/nls/iso8859-15/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-15 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-15 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-2/Makefile.am b/nls/iso8859-2/Makefile.am index f23cf233..13e60532 100644 --- a/nls/iso8859-2/Makefile.am +++ b/nls/iso8859-2/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-2 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-2 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-3/Makefile.am b/nls/iso8859-3/Makefile.am index 8a55fefb..f389d91d 100644 --- a/nls/iso8859-3/Makefile.am +++ b/nls/iso8859-3/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-3 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-3 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-4/Makefile.am b/nls/iso8859-4/Makefile.am index 75fabf24..5e68d036 100644 --- a/nls/iso8859-4/Makefile.am +++ b/nls/iso8859-4/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-4 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-4 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-5/Makefile.am b/nls/iso8859-5/Makefile.am index d5b105f8..574ce1eb 100644 --- a/nls/iso8859-5/Makefile.am +++ b/nls/iso8859-5/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-5 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-5 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-6/Makefile.am b/nls/iso8859-6/Makefile.am index 269fc9ee..cfde9845 100644 --- a/nls/iso8859-6/Makefile.am +++ b/nls/iso8859-6/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-6 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-6 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-7/Makefile.am b/nls/iso8859-7/Makefile.am index 2430acaa..6395d322 100644 --- a/nls/iso8859-7/Makefile.am +++ b/nls/iso8859-7/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-7 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-7 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-8/Makefile.am b/nls/iso8859-8/Makefile.am index 1502406c..351cfa4f 100644 --- a/nls/iso8859-8/Makefile.am +++ b/nls/iso8859-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-9/Makefile.am b/nls/iso8859-9/Makefile.am index a4b2177d..c46388f4 100644 --- a/nls/iso8859-9/Makefile.am +++ b/nls/iso8859-9/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-9 +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9 include $(top_srcdir)/nls/localerules.in diff --git a/nls/iso8859-9e/Makefile.am b/nls/iso8859-9e/Makefile.am index e74503f6..1f53628b 100644 --- a/nls/iso8859-9e/Makefile.am +++ b/nls/iso8859-9e/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-9e +x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9e include $(top_srcdir)/nls/localerules.in diff --git a/nls/ja.JIS/Makefile.am b/nls/ja.JIS/Makefile.am index 35a6c007..bb5b1bb6 100644 --- a/nls/ja.JIS/Makefile.am +++ b/nls/ja.JIS/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ja.JIS +x11thislocaledir = $(X11_LOCALEDATADIR)/ja.JIS include $(top_srcdir)/nls/localerules.in diff --git a/nls/ja.S90/Makefile.am b/nls/ja.S90/Makefile.am index 1a8e1bbd..c4c843d6 100644 --- a/nls/ja.S90/Makefile.am +++ b/nls/ja.S90/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ja.S90 +x11thislocaledir = $(X11_LOCALEDATADIR)/ja.S90 include $(top_srcdir)/nls/localerules.in diff --git a/nls/ja.SJIS/Makefile.am b/nls/ja.SJIS/Makefile.am index 09de863c..19f2b840 100644 --- a/nls/ja.SJIS/Makefile.am +++ b/nls/ja.SJIS/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ja.SJIS +x11thislocaledir = $(X11_LOCALEDATADIR)/ja.SJIS include $(top_srcdir)/nls/localerules.in diff --git a/nls/ja.U90/Makefile.am b/nls/ja.U90/Makefile.am index 562341bb..a98374ab 100644 --- a/nls/ja.U90/Makefile.am +++ b/nls/ja.U90/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ja.U90 +x11thislocaledir = $(X11_LOCALEDATADIR)/ja.U90 include $(top_srcdir)/nls/localerules.in diff --git a/nls/ja/Makefile.am b/nls/ja/Makefile.am index cc88a989..47fbacc2 100644 --- a/nls/ja/Makefile.am +++ b/nls/ja/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ja +x11thislocaledir = $(X11_LOCALEDATADIR)/ja include $(top_srcdir)/nls/localerules.in diff --git a/nls/ja_JP.UTF-8/Makefile.am b/nls/ja_JP.UTF-8/Makefile.am index 7c3ea2f1..8bdf5e42 100644 --- a/nls/ja_JP.UTF-8/Makefile.am +++ b/nls/ja_JP.UTF-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ja_JP.UTF-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/ja_JP.UTF-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/ko/Makefile.am b/nls/ko/Makefile.am index 25622d9f..17e39a35 100644 --- a/nls/ko/Makefile.am +++ b/nls/ko/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ko +x11thislocaledir = $(X11_LOCALEDATADIR)/ko include $(top_srcdir)/nls/localerules.in diff --git a/nls/ko_KR.UTF-8/Makefile.am b/nls/ko_KR.UTF-8/Makefile.am index 584376fa..dc98b9d0 100644 --- a/nls/ko_KR.UTF-8/Makefile.am +++ b/nls/ko_KR.UTF-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/ko_KR.UTF-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/ko_KR.UTF-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/koi8-c/Makefile.am b/nls/koi8-c/Makefile.am index e9f67dd8..88ae93fe 100644 --- a/nls/koi8-c/Makefile.am +++ b/nls/koi8-c/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/koi8-c +x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-c include $(top_srcdir)/nls/localerules.in diff --git a/nls/koi8-r/Makefile.am b/nls/koi8-r/Makefile.am index b046ce67..af5a2302 100644 --- a/nls/koi8-r/Makefile.am +++ b/nls/koi8-r/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/koi8-r +x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-r include $(top_srcdir)/nls/localerules.in diff --git a/nls/koi8-u/Makefile.am b/nls/koi8-u/Makefile.am index f11d0fe8..92ead47a 100644 --- a/nls/koi8-u/Makefile.am +++ b/nls/koi8-u/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/koi8-u +x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-u include $(top_srcdir)/nls/localerules.in diff --git a/nls/microsoft-cp1251/Makefile.am b/nls/microsoft-cp1251/Makefile.am index 94ae30c9..5842c904 100644 --- a/nls/microsoft-cp1251/Makefile.am +++ b/nls/microsoft-cp1251/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/microsoft-cp1251 +x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1251 include $(top_srcdir)/nls/localerules.in diff --git a/nls/microsoft-cp1255/Makefile.am b/nls/microsoft-cp1255/Makefile.am index 70f3bb39..d8b71228 100644 --- a/nls/microsoft-cp1255/Makefile.am +++ b/nls/microsoft-cp1255/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/microsoft-cp1255 +x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1255 include $(top_srcdir)/nls/localerules.in diff --git a/nls/microsoft-cp1256/Makefile.am b/nls/microsoft-cp1256/Makefile.am index c178e6de..c4250bda 100644 --- a/nls/microsoft-cp1256/Makefile.am +++ b/nls/microsoft-cp1256/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/microsoft-cp1256 +x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1256 include $(top_srcdir)/nls/localerules.in diff --git a/nls/mulelao-1/Makefile.am b/nls/mulelao-1/Makefile.am index 0ae8e076..8d37d331 100644 --- a/nls/mulelao-1/Makefile.am +++ b/nls/mulelao-1/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/mulelao-1 +x11thislocaledir = $(X11_LOCALEDATADIR)/mulelao-1 include $(top_srcdir)/nls/localerules.in diff --git a/nls/nokhchi-1/Makefile.am b/nls/nokhchi-1/Makefile.am index 602cf9e0..5504ff3f 100644 --- a/nls/nokhchi-1/Makefile.am +++ b/nls/nokhchi-1/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/nokhchi-1 +x11thislocaledir = $(X11_LOCALEDATADIR)/nokhchi-1 include $(top_srcdir)/nls/localerules.in diff --git a/nls/pt_BR.UTF-8/Makefile.am b/nls/pt_BR.UTF-8/Makefile.am index 03542bdf..18684798 100644 --- a/nls/pt_BR.UTF-8/Makefile.am +++ b/nls/pt_BR.UTF-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/pt_BR.UTF-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/pt_BR.UTF-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/tatar-cyr/Makefile.am b/nls/tatar-cyr/Makefile.am index 7d566227..505956c7 100644 --- a/nls/tatar-cyr/Makefile.am +++ b/nls/tatar-cyr/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/tatar-cyr +x11thislocaledir = $(X11_LOCALEDATADIR)/tatar-cyr include $(top_srcdir)/nls/localerules.in diff --git a/nls/th_TH.UTF-8/Makefile.am b/nls/th_TH.UTF-8/Makefile.am index 83cec92a..ab216189 100644 --- a/nls/th_TH.UTF-8/Makefile.am +++ b/nls/th_TH.UTF-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/th_TH.UTF-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH.UTF-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/th_TH/Makefile.am b/nls/th_TH/Makefile.am index 02bb10a2..39cbc233 100644 --- a/nls/th_TH/Makefile.am +++ b/nls/th_TH/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/th_TH +x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH include $(top_srcdir)/nls/localerules.in diff --git a/nls/tscii-0/Makefile.am b/nls/tscii-0/Makefile.am index 279e1674..f8aa71fb 100644 --- a/nls/tscii-0/Makefile.am +++ b/nls/tscii-0/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/tscii-0 +x11thislocaledir = $(X11_LOCALEDATADIR)/tscii-0 include $(top_srcdir)/nls/localerules.in diff --git a/nls/vi_VN.tcvn/Makefile.am b/nls/vi_VN.tcvn/Makefile.am index 5bf57145..ed94bd64 100644 --- a/nls/vi_VN.tcvn/Makefile.am +++ b/nls/vi_VN.tcvn/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/vi_VN.tcvn +x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.tcvn include $(top_srcdir)/nls/localerules.in diff --git a/nls/vi_VN.viscii/Makefile.am b/nls/vi_VN.viscii/Makefile.am index 4b4599f6..1b2bc34b 100644 --- a/nls/vi_VN.viscii/Makefile.am +++ b/nls/vi_VN.viscii/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/vi_VN.viscii +x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.viscii include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_CN.UTF-8/Makefile.am b/nls/zh_CN.UTF-8/Makefile.am index e4469fad..7dd4aba9 100644 --- a/nls/zh_CN.UTF-8/Makefile.am +++ b/nls/zh_CN.UTF-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_CN.UTF-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.UTF-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_CN.gb18030/Makefile.am b/nls/zh_CN.gb18030/Makefile.am index c3845c14..de647431 100644 --- a/nls/zh_CN.gb18030/Makefile.am +++ b/nls/zh_CN.gb18030/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_CN.gb18030 +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gb18030 include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_CN.gbk/Makefile.am b/nls/zh_CN.gbk/Makefile.am index d38567bc..c4586656 100644 --- a/nls/zh_CN.gbk/Makefile.am +++ b/nls/zh_CN.gbk/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_CN.gbk +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gbk include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am index 7f965546..e4c74e7b 100644 --- a/nls/zh_CN/Makefile.am +++ b/nls/zh_CN/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_CN +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_HK.UTF-8/Makefile.am b/nls/zh_HK.UTF-8/Makefile.am index d1ac5e64..89d75307 100644 --- a/nls/zh_HK.UTF-8/Makefile.am +++ b/nls/zh_HK.UTF-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_HK.UTF-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.UTF-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_HK.big5/Makefile.am b/nls/zh_HK.big5/Makefile.am index 0f790737..b8229ddd 100644 --- a/nls/zh_HK.big5/Makefile.am +++ b/nls/zh_HK.big5/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_HK.big5 +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5 include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_HK.big5hkscs/Makefile.am b/nls/zh_HK.big5hkscs/Makefile.am index c70cd74b..b4d5f83b 100644 --- a/nls/zh_HK.big5hkscs/Makefile.am +++ b/nls/zh_HK.big5hkscs/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_HK.big5hkscs +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5hkscs include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_TW.UTF-8/Makefile.am b/nls/zh_TW.UTF-8/Makefile.am index cf1f9232..12794176 100644 --- a/nls/zh_TW.UTF-8/Makefile.am +++ b/nls/zh_TW.UTF-8/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_TW.UTF-8 +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.UTF-8 include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_TW.big5/Makefile.am b/nls/zh_TW.big5/Makefile.am index 60b3e082..b8fbe546 100644 --- a/nls/zh_TW.big5/Makefile.am +++ b/nls/zh_TW.big5/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_TW.big5 +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.big5 include $(top_srcdir)/nls/localerules.in diff --git a/nls/zh_TW/Makefile.am b/nls/zh_TW/Makefile.am index a871bdca..a847cc3b 100644 --- a/nls/zh_TW/Makefile.am +++ b/nls/zh_TW/Makefile.am @@ -1,3 +1,3 @@ -x11thislocaledir = @X11_LOCALEDATADIR@/zh_TW +x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW include $(top_srcdir)/nls/localerules.in |