Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Nskh5-0004Uw-Ka for mharc-grub-devel@gnu.org; Fri, 19 Mar 2010 18:29:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nskh3-0004Ur-SW for grub-devel@gnu.org; Fri, 19 Mar 2010 18:29:25 -0400 Received: from [140.186.70.92] (port=42395 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nskh1-0004Uj-L7 for grub-devel@gnu.org; Fri, 19 Mar 2010 18:29:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nskh0-00059K-IL for grub-devel@gnu.org; Fri, 19 Mar 2010 18:29:23 -0400 Received: from mail-fx0-f210.google.com ([209.85.220.210]:38588) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nskh0-000595-Ci for grub-devel@gnu.org; Fri, 19 Mar 2010 18:29:22 -0400 Received: by fxm2 with SMTP id 2so1035966fxm.26 for ; Fri, 19 Mar 2010 15:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:received :received:date:from:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=0jM9ofJ+GewOXbn5tLJ8Mto6J0nVJNKZaLstP4QuErg=; b=lOijvdlziyiBxI5BfgBVpn8uKq2RYEcJbnm1iDYzB8Co+wiLqVa3rorzGS1rJ8cSYo SZYjkX+507mw7jbn8JcCqVSy06hhl05JYRhI/tBboD6ffLpYqOriE242e0xqtsX2S1TA r4z0JmdlVng/eeQgNH96W352Z5Z9WywSjZGu0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=tvSz5hc3uUK4MojcdWV/RMQlUNQRYgKQgBXe9xaHH0S6qvvKnBKM0TfHAccCDhQc/V 4jFUuLxyCcZB6UMOe9PLO+bpP7UyM8oWNxkY2JyVs2AJs7PT9oU7BBe3Cv5tbXsdotLr 1nNJY4lqszwDuSD8K0EEkBWtXYf4kUAKf+h2s= Received: by 10.102.15.13 with SMTP id 13mr8225513muo.91.1269037761268; Fri, 19 Mar 2010 15:29:21 -0700 (PDT) Received: from mail.pina.cat (197.Red-80-32-81.staticIP.rima-tde.net [80.32.81.197]) by mx.google.com with ESMTPS id j2sm9028507mue.53.2010.03.19.15.29.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 19 Mar 2010 15:29:20 -0700 (PDT) Sender: Carles Pina i Estany Received: from pinux (cpc2-hari6-0-0-cust86.hari.cable.virginmedia.com [82.45.164.87]) by mail.pina.cat (Postfix) with ESMTPA id 6E1BB288F3017 for ; Fri, 19 Mar 2010 23:29:17 +0100 (CET) Received: from pinux (localhost.localdomain [127.0.0.1]) by pinux (Postfix) with ESMTP id 95A6A894F9B for ; Fri, 19 Mar 2010 22:29:16 +0000 (GMT) Received: by pinux (Postfix, from userid 1000) id 7CB98894F9A; Fri, 19 Mar 2010 22:28:16 +0000 (GMT) Date: Fri, 19 Mar 2010 22:28:16 +0000 From: Carles Pina i Estany To: The development of GNU GRUB Message-ID: <20100319222816.GA25289@pina.cat> References: <20100319115008.GV20777@riva.ucam.org> <20100319203523.GA7679@pina.cat> <20100319222120.GA20777@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100319222120.GA20777@riva.ucam.org> User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: [PATCH] Fix locale installation X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2010 22:29:26 -0000 Hello, On Mar/19/2010, Colin Watson wrote: > On Fri, Mar 19, 2010 at 08:35:23PM +0000, Carles Pina i Estany wrote: > > On Mar/19/2010, Colin Watson wrote: > > > # Copy gettext files > > > mkdir -p ${grubdir}/locale/ > > > -for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do > > > - if test -f "$file"; then > > > - cp -f "$file" ${grubdir}/locale/ > > > +for dir in ${localedir}/*; do > > > + if test -f "$dir/LC_MESSAGES/grub.mo"; then > > > + cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo" > > > fi > > > done > > > > (I'll use shell variables in a bit "on my own way") > > > > AFAIK the files are in po/$lang.{po,mo}, right? (at least in > > my system without using another directory for the building, I need to > > look in the other issue soon) > > In the source, they live in po/$lang.po and po/$lang.mo. However, when > you run 'make install', they end up in > $datadir/locale/$lang/LC_MESSAGES/grub.mo. grub-install should be > looking at the paths used by 'make install', rather than the paths in > the source tree which generally won't be accessible. ahh, yeap, I confused grub-install and make install > > I thought that make install was copying from po/$lang.mo to > > /usr/share/locale/$lang/LC_MESSAGES/grub.mo, but you are copying already > > from some structure in $localedir/LC_MESSAGES/grub.mo. What am I missing? > > You just misread my code slightly, I think. I'm actually copying from I mixed grub-install/make install and what you was doing there... > $localedir/*/LC_MESSAGES/grub.mo. My code will copy (e.g.) > /usr/share/locale/es/LC_MESSAGES/grub.mo to /boot/grub/locale/es.mo. > This seems better than creating lots of subdirectories of > /boot/grub/locale/. Yeap, in that case you are right and the code looks fine :-) -- Carles Pina i Estany http://pinux.info