summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2010-11-22 20:41:39 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2010-11-26 12:17:15 -0500
commit3603a645643713227c7cafe536ef0d0a0c3df87b (patch)
tree53fd86c971060c41592fd80f6513511ea3b36b6c
parentd49f0c1737441a9fda6d3dcabfe492c90347cfee (diff)
XQuartz: Remove existing localization files on install to avoid conflicts
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit f9fbafa1a07f951e89f208bf4928a0bf37b67cfe)
-rwxr-xr-xhw/xquartz/bundle/mk_bundke.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
index c85b21765..58d5f6abf 100755
--- a/hw/xquartz/bundle/mk_bundke.sh
+++ b/hw/xquartz/bundle/mk_bundke.sh
@@ -8,6 +8,7 @@ BUNDLE_ROOT=$3
localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW"
for lang in ${localities} ; do
+ [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj ] && rm -rf ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj
mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib
[ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1
@@ -16,7 +17,7 @@ for lang in ${localities} ; do
done
done
-install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib
+install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib/designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib
install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources
install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents