From patchwork Sun Apr  6 16:50:25 2008
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: =?utf-8?q?Ville_Skytt=C3=A4?= <ville.skytta@iki.fi>
X-Patchwork-Id: 12642
Received: from smtp6.pp.htv.fi ([213.243.153.40])
	by www.linuxtv.org with esmtp (Exim 4.63)
	(envelope-from <ville.skytta@iki.fi>) id 1JiY4c-0003Fw-M1
	for vdr@linuxtv.org; Sun, 06 Apr 2008 18:50:31 +0200
Received: from viper.bobcat.mine.nu (cs181065188.pp.htv.fi [82.181.65.188])
	by smtp6.pp.htv.fi (Postfix) with ESMTP id BA66B5BC038
	for <vdr@linuxtv.org>; Sun,  6 Apr 2008 19:50:26 +0300 (EEST)
From: Ville =?iso-8859-1?q?Skytt=E4?= <ville.skytta@iki.fi>
To: VDR Mailing List <vdr@linuxtv.org>
Date: Sun, 6 Apr 2008 19:50:25 +0300
User-Agent: KMail/1.9.9
MIME-Version: 1.0
Message-Id: <200804061950.26187.ville.skytta@iki.fi>
X-LSpam-Score: -1.7 (-)
X-LSpam-Report: No, score=-1.7 required=5.0 tests=AWL=0.910,
	BAYES_00=-2.599 autolearn=ham
Subject: [vdr] LOCDIR/LOCALEDIR and plugins
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Apr 2008 16:50:32 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 16348

Hello,

I'm a bit confused about the locale dir stuff in VDR 1.6.0 especially wrt. 
plugins.  newplugin hardcodes LOCALEDIR to $(VDRDIR)/locale without taking 
Make.config into account at all.  The result is that plugins will try to 
place their *.mo into a wrong location if LOCDIR was customized in in VDR's 
Make.config and/or "make install" was used.  I suppose the attached patch 
would fix that.

However that does not address weirdness in main VDR's locale dir handling; the 
value set for LOCDIR in Make.config gets built into vdr as the compile time 
default locale dir, but but "make install-i18n" will install the *.mo 
somewhere else unless one sets identical value for LOCALEDIR in Makefile 
(setting it in Make.config does not have any effect).  Are both LOCDIR and 
LOCALEDIR needed?  I'd try to clean this up and post a patch that fixes it if 
I knew what the intention is :)

--- newplugin~	2008-01-13 15:00:23.000000000 +0200
+++ newplugin	2008-04-06 19:34:52.000000000 +0300
@@ -84,6 +84,7 @@
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
+LOCDIR = \$(VDRDIR)/locale
 
 ### Allow user defined options to overwrite defaults:
 
@@ -129,9 +130,8 @@
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = \$(VDRDIR)/locale
 I18Npo    = \$(wildcard \$(PODIR)/*.po)
-I18Nmsgs  = \$(addprefix \$(LOCALEDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))))
+I18Nmsgs  = \$(addprefix \$(LOCDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))))
 I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 
 %.mo: %.po
@@ -144,7 +144,7 @@
 	msgmerge -U --no-wrap --no-location --backup=none -q \$\@ \$<
 	\@touch \$\@
 
-\$(I18Nmsgs): \$(LOCALEDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
+\$(I18Nmsgs): \$(LOCDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
 	\@mkdir -p \$(dir \$@)
 	cp \$< \$\@