diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-07-03 10:17:38 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-07-03 10:17:38 +0000 |
| commit | 55328bb6caabd37885cd19d7a5821ed425daf321 (patch) | |
| tree | 499b8d60ca5783d6483400a4924bfc614bda6972 | |
| parent | 726538ba21b631bfb0b8094a5546acdaf57379ff (diff) | |
Avoid a gmake-specific construct, and instead just write the name of the current directory into each Makefile.am.
57 files changed, 62 insertions, 56 deletions
@@ -1,3 +1,9 @@ +2005-07-03 Eric Anholt <anholt@FreeBSD.org> + + * nls/*/Makefile.am: + Avoid a gmake-specific construct, and instead just write the name of + the current directory into each Makefile.am. + 2005-07-02 Daniel Stone <daniel@freedesktop.org> Fix objdir != srcdir, as well as make distcheck. diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am index 3adc393b..13a66460 100644 --- a/nls/C/Makefile.am +++ b/nls/C/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/C EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/armscii-8/Makefile.am b/nls/armscii-8/Makefile.am index 3adc393b..459364ef 100644 --- a/nls/armscii-8/Makefile.am +++ b/nls/armscii-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/armscii-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/en_US.UTF-8/Makefile.am b/nls/en_US.UTF-8/Makefile.am index 3adc393b..538dea35 100644 --- a/nls/en_US.UTF-8/Makefile.am +++ b/nls/en_US.UTF-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/en_US.UTF-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/georgian-academy/Makefile.am b/nls/georgian-academy/Makefile.am index 3adc393b..4b8a3e85 100644 --- a/nls/georgian-academy/Makefile.am +++ b/nls/georgian-academy/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/georgian-academy EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/georgian-ps/Makefile.am b/nls/georgian-ps/Makefile.am index 3adc393b..6b559a70 100644 --- a/nls/georgian-ps/Makefile.am +++ b/nls/georgian-ps/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/georgian-ps EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ibm-cp1133/Makefile.am b/nls/ibm-cp1133/Makefile.am index 3adc393b..d5f36197 100644 --- a/nls/ibm-cp1133/Makefile.am +++ b/nls/ibm-cp1133/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ibm-cp1133 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iscii-dev/Makefile.am b/nls/iscii-dev/Makefile.am index 3adc393b..a0837da4 100644 --- a/nls/iscii-dev/Makefile.am +++ b/nls/iscii-dev/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iscii-dev EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/isiri-3342/Makefile.am b/nls/isiri-3342/Makefile.am index 3adc393b..76fc515a 100644 --- a/nls/isiri-3342/Makefile.am +++ b/nls/isiri-3342/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/isiri-3342 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-1/Makefile.am b/nls/iso8859-1/Makefile.am index 3adc393b..bc9d04ad 100644 --- a/nls/iso8859-1/Makefile.am +++ b/nls/iso8859-1/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-1 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-10/Makefile.am b/nls/iso8859-10/Makefile.am index 3adc393b..f2fed61c 100644 --- a/nls/iso8859-10/Makefile.am +++ b/nls/iso8859-10/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-10 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-11/Makefile.am b/nls/iso8859-11/Makefile.am index 3adc393b..9fcc6a8a 100644 --- a/nls/iso8859-11/Makefile.am +++ b/nls/iso8859-11/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-11 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-13/Makefile.am b/nls/iso8859-13/Makefile.am index 3adc393b..a1729d27 100644 --- a/nls/iso8859-13/Makefile.am +++ b/nls/iso8859-13/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-13 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-14/Makefile.am b/nls/iso8859-14/Makefile.am index 3adc393b..ecfc6ace 100644 --- a/nls/iso8859-14/Makefile.am +++ b/nls/iso8859-14/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-14 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-15/Makefile.am b/nls/iso8859-15/Makefile.am index 3adc393b..c5c72967 100644 --- a/nls/iso8859-15/Makefile.am +++ b/nls/iso8859-15/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-15 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-2/Makefile.am b/nls/iso8859-2/Makefile.am index 3adc393b..1bb367ad 100644 --- a/nls/iso8859-2/Makefile.am +++ b/nls/iso8859-2/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-2 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-3/Makefile.am b/nls/iso8859-3/Makefile.am index 3adc393b..8d17a602 100644 --- a/nls/iso8859-3/Makefile.am +++ b/nls/iso8859-3/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-3 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-4/Makefile.am b/nls/iso8859-4/Makefile.am index 3adc393b..ed29d94d 100644 --- a/nls/iso8859-4/Makefile.am +++ b/nls/iso8859-4/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-4 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-5/Makefile.am b/nls/iso8859-5/Makefile.am index 3adc393b..c875fe7a 100644 --- a/nls/iso8859-5/Makefile.am +++ b/nls/iso8859-5/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-5 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-6/Makefile.am b/nls/iso8859-6/Makefile.am index 3adc393b..23c55fa0 100644 --- a/nls/iso8859-6/Makefile.am +++ b/nls/iso8859-6/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-6 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-7/Makefile.am b/nls/iso8859-7/Makefile.am index 3adc393b..7e77c98d 100644 --- a/nls/iso8859-7/Makefile.am +++ b/nls/iso8859-7/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-7 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-8/Makefile.am b/nls/iso8859-8/Makefile.am index 3adc393b..59d6f72b 100644 --- a/nls/iso8859-8/Makefile.am +++ b/nls/iso8859-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-9/Makefile.am b/nls/iso8859-9/Makefile.am index 3adc393b..a8c2fa23 100644 --- a/nls/iso8859-9/Makefile.am +++ b/nls/iso8859-9/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-9 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/iso8859-9e/Makefile.am b/nls/iso8859-9e/Makefile.am index 3adc393b..b487754d 100644 --- a/nls/iso8859-9e/Makefile.am +++ b/nls/iso8859-9e/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/iso8859-9e EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ja.JIS/Makefile.am b/nls/ja.JIS/Makefile.am index 3adc393b..13aa6895 100644 --- a/nls/ja.JIS/Makefile.am +++ b/nls/ja.JIS/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ja.JIS EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ja.S90/Makefile.am b/nls/ja.S90/Makefile.am index 3adc393b..076bc9e6 100644 --- a/nls/ja.S90/Makefile.am +++ b/nls/ja.S90/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ja.S90 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ja.SJIS/Makefile.am b/nls/ja.SJIS/Makefile.am index 3adc393b..743f1023 100644 --- a/nls/ja.SJIS/Makefile.am +++ b/nls/ja.SJIS/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ja.SJIS EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ja.U90/Makefile.am b/nls/ja.U90/Makefile.am index 3adc393b..46b6f09d 100644 --- a/nls/ja.U90/Makefile.am +++ b/nls/ja.U90/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ja.U90 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ja/Makefile.am b/nls/ja/Makefile.am index 3adc393b..af4a0e15 100644 --- a/nls/ja/Makefile.am +++ b/nls/ja/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ja EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ja_JP.UTF-8/Makefile.am b/nls/ja_JP.UTF-8/Makefile.am index 3adc393b..0903b280 100644 --- a/nls/ja_JP.UTF-8/Makefile.am +++ b/nls/ja_JP.UTF-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ja_JP.UTF-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ko/Makefile.am b/nls/ko/Makefile.am index 3adc393b..04ebc6d7 100644 --- a/nls/ko/Makefile.am +++ b/nls/ko/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ko EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/ko_KR.UTF-8/Makefile.am b/nls/ko_KR.UTF-8/Makefile.am index 3adc393b..41de5786 100644 --- a/nls/ko_KR.UTF-8/Makefile.am +++ b/nls/ko_KR.UTF-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/ko_KR.UTF-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/koi8-c/Makefile.am b/nls/koi8-c/Makefile.am index 3adc393b..7b63a6bc 100644 --- a/nls/koi8-c/Makefile.am +++ b/nls/koi8-c/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/koi8-c EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/koi8-r/Makefile.am b/nls/koi8-r/Makefile.am index 3adc393b..fda9f397 100644 --- a/nls/koi8-r/Makefile.am +++ b/nls/koi8-r/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/koi8-r EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/koi8-u/Makefile.am b/nls/koi8-u/Makefile.am index 3adc393b..967a0783 100644 --- a/nls/koi8-u/Makefile.am +++ b/nls/koi8-u/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/koi8-u EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/microsoft-cp1251/Makefile.am b/nls/microsoft-cp1251/Makefile.am index 3adc393b..4078d879 100644 --- a/nls/microsoft-cp1251/Makefile.am +++ b/nls/microsoft-cp1251/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/microsoft-cp1251 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/microsoft-cp1255/Makefile.am b/nls/microsoft-cp1255/Makefile.am index 3adc393b..9c2cb997 100644 --- a/nls/microsoft-cp1255/Makefile.am +++ b/nls/microsoft-cp1255/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/microsoft-cp1255 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/microsoft-cp1256/Makefile.am b/nls/microsoft-cp1256/Makefile.am index 3adc393b..bc304c01 100644 --- a/nls/microsoft-cp1256/Makefile.am +++ b/nls/microsoft-cp1256/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/microsoft-cp1256 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/mulelao-1/Makefile.am b/nls/mulelao-1/Makefile.am index 3adc393b..e67db7e9 100644 --- a/nls/mulelao-1/Makefile.am +++ b/nls/mulelao-1/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/mulelao-1 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/nokhchi-1/Makefile.am b/nls/nokhchi-1/Makefile.am index 3adc393b..32eb24fc 100644 --- a/nls/nokhchi-1/Makefile.am +++ b/nls/nokhchi-1/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/nokhchi-1 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/pt_BR.UTF-8/Makefile.am b/nls/pt_BR.UTF-8/Makefile.am index 3adc393b..1800c816 100644 --- a/nls/pt_BR.UTF-8/Makefile.am +++ b/nls/pt_BR.UTF-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/pt_BR.UTF-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/tatar-cyr/Makefile.am b/nls/tatar-cyr/Makefile.am index 3adc393b..cdce658f 100644 --- a/nls/tatar-cyr/Makefile.am +++ b/nls/tatar-cyr/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/tatar-cyr EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/th_TH.UTF-8/Makefile.am b/nls/th_TH.UTF-8/Makefile.am index 3adc393b..c9611229 100644 --- a/nls/th_TH.UTF-8/Makefile.am +++ b/nls/th_TH.UTF-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/th_TH.UTF-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/th_TH/Makefile.am b/nls/th_TH/Makefile.am index 3adc393b..14ce8f37 100644 --- a/nls/th_TH/Makefile.am +++ b/nls/th_TH/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/th_TH EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/tscii-0/Makefile.am b/nls/tscii-0/Makefile.am index 3adc393b..7b52b744 100644 --- a/nls/tscii-0/Makefile.am +++ b/nls/tscii-0/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/tscii-0 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/vi_VN.tcvn/Makefile.am b/nls/vi_VN.tcvn/Makefile.am index 3adc393b..b38ae6da 100644 --- a/nls/vi_VN.tcvn/Makefile.am +++ b/nls/vi_VN.tcvn/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/vi_VN.tcvn EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/vi_VN.viscii/Makefile.am b/nls/vi_VN.viscii/Makefile.am index 3adc393b..7d66fc23 100644 --- a/nls/vi_VN.viscii/Makefile.am +++ b/nls/vi_VN.viscii/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/vi_VN.viscii EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_CN.UTF-8/Makefile.am b/nls/zh_CN.UTF-8/Makefile.am index 3adc393b..212a979a 100644 --- a/nls/zh_CN.UTF-8/Makefile.am +++ b/nls/zh_CN.UTF-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_CN.UTF-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_CN.gb18030/Makefile.am b/nls/zh_CN.gb18030/Makefile.am index 3adc393b..89a5f1ef 100644 --- a/nls/zh_CN.gb18030/Makefile.am +++ b/nls/zh_CN.gb18030/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_CN.gb18030 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_CN.gbk/Makefile.am b/nls/zh_CN.gbk/Makefile.am index 3adc393b..970a99c2 100644 --- a/nls/zh_CN.gbk/Makefile.am +++ b/nls/zh_CN.gbk/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_CN.gbk EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am index 3adc393b..f66d091c 100644 --- a/nls/zh_CN/Makefile.am +++ b/nls/zh_CN/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_CN EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_HK.UTF-8/Makefile.am b/nls/zh_HK.UTF-8/Makefile.am index 3adc393b..d7a7c2c6 100644 --- a/nls/zh_HK.UTF-8/Makefile.am +++ b/nls/zh_HK.UTF-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_HK.UTF-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_HK.big5/Makefile.am b/nls/zh_HK.big5/Makefile.am index 3adc393b..1a1a8a22 100644 --- a/nls/zh_HK.big5/Makefile.am +++ b/nls/zh_HK.big5/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_HK.big5 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_HK.big5hkscs/Makefile.am b/nls/zh_HK.big5hkscs/Makefile.am index 3adc393b..8e9d9123 100644 --- a/nls/zh_HK.big5hkscs/Makefile.am +++ b/nls/zh_HK.big5hkscs/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_HK.big5hkscs EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_TW.UTF-8/Makefile.am b/nls/zh_TW.UTF-8/Makefile.am index 3adc393b..95913596 100644 --- a/nls/zh_TW.UTF-8/Makefile.am +++ b/nls/zh_TW.UTF-8/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_TW.UTF-8 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_TW.big5/Makefile.am b/nls/zh_TW.big5/Makefile.am index 3adc393b..eb0abd62 100644 --- a/nls/zh_TW.big5/Makefile.am +++ b/nls/zh_TW.big5/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_TW.big5 EXTRA_DIST = XLC_LOCALE.pre Compose.pre diff --git a/nls/zh_TW/Makefile.am b/nls/zh_TW/Makefile.am index 3adc393b..c0c8a57e 100644 --- a/nls/zh_TW/Makefile.am +++ b/nls/zh_TW/Makefile.am @@ -1,4 +1,4 @@ -x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) +x11thislocaledir = @X11_LOCALEDIR@/zh_TW EXTRA_DIST = XLC_LOCALE.pre Compose.pre |