From e6929f049562ef917e93f8767e50b3e3c7abc231 Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Fri, 29 Feb 2008 02:04:12 +0100 Subject: * support flat file locales (e.g. no jar:) and improve readability of MOZCALL_manifest_locale_files_to_outdir call - update src/lp-locale-export.mk --- src/lp-locale-export.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/lp-locale-export.mk b/src/lp-locale-export.mk index f09aaf9..20a6806 100644 --- a/src/lp-locale-export.mk +++ b/src/lp-locale-export.mk @@ -52,12 +52,15 @@ MOZCALL_filter_manifest_locales_by_lang_to_norm = \ MOZCALL_manifest_locale_files_to_outdir = \ $(shell \ if test `grep -c ^locale $(1)` -gt 0; then \ - tar -c -C `dirname $(1)`/ -f - \ - `cat $(1) | \ - grep "^locale " | \ - grep " $(2) " | \ - sed -e 's/^.* $(2) jar:\(.*\)!.*$$/\1/' \ - ` | \ + localefiles=`cat $(1) | \ + grep "^locale[[:space:]]" | \ + grep "[[:space:]]$(2)[[:space:]]" | \ + sed -e 's/^.*[[:space:]]$(2)[[:space:]]jar:\(.*\)!.*$$/\1/' | \ + sed -e 's/^.*[[:space:]][[:space:]]*$(2)[[:space:]][[:space:]]*\(.*\)$$/\1/' \ + `; \ + echo "tar -c -C `dirname $(1)`/ -f - $$localefiles \| \ + tar -C $(3) -x -f - " > /tmp/cmd; \ + tar -c -C `dirname $(1)`/ -f - $$localefiles | \ tar -C $(3) -x -f -; \ fi \ ) -- cgit v1.2.3