summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'locale-gen')
-rwxr-xr-xlocale-gen17
1 files changed, 7 insertions, 10 deletions
diff --git a/locale-gen b/locale-gen
index b330851..140654a 100755
--- a/locale-gen
+++ b/locale-gen
@@ -115,26 +115,23 @@ fi
: ${ROOT:=/}
ROOT="${ROOT%/}/"
-if [[ -n ${DESTDIR} ]] && [[ ${ROOT} != "/" ]] ; then
- eerror "DESTDIR and ROOT are mutually exclusive options"
- exit 1
+
+if [[ ${ROOT} != "/" ]] ; then
+ eerror "Sorry, but ROOT is not supported."
+ exit 0
fi
-: ${EROOT:="${ROOT%/}${EPREFIX}/"}
+
+: ${EROOT:="${EPREFIX}/"}
if [[ ${EROOT} != "/" ]] ; then
einfo "Using locale.gen from ROOT ${EROOT}etc/"
fi
+
if [[ -n ${DESTDIR} ]] ; then
einfo "Building locales in DESTDIR '${DESTDIR}'"
else
DESTDIR=${EROOT}
fi
-# XXX: should fix this ...
-if [[ ${ROOT} != "/" ]] ; then
- eerror "Sorry, but ROOT support is incomplete at this time."
- exit 0
-fi
-
: ${CONFIG:=${EROOT}etc/locale.gen}
LOCALES=${DESTDIR}usr/share/i18n/locales
CHARMAPS=${DESTDIR}usr/share/i18n/charmaps