From f9fbafa1a07f951e89f208bf4928a0bf37b67cfe Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 22 Nov 2010 20:41:39 -0800 Subject: [PATCH] XQuartz: Remove existing localization files on install to avoid conflicts Signed-off-by: Jeremy Huddleston --- hw/xquartz/bundle/mk_bundke.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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