[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - mysqlc/source solenv/inc

[Libreoffice Gerrit user]

 mysqlc/source/makefile.mk |    2 +-
 solenv/inc/rules.mk       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0cf259c9fbf10187306999b35126e92b32a57752
Author: Andras Timar <atimar at suse.com>
Date:   Sat Dec 15 10:37:52 2012 +0100

    fdo#58156 use WITH_LANG_LIST instead of WITH_LANG
    
    Change-Id: Ie87469d7553d1dcad49348c42d3cca99a43d709c

diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index 5fecb22..207d785 100644
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -236,7 +236,7 @@ $(COMPONENT_DESCRIPTIONS_PACKDEP) : $(DESCRIPTION)
 $(DESCRIPTION_SRC): description.xml
     +-$(RM) $@
 .IF "$(WITH_LANG)" != ""
-    $(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG)) $(SRCDIR)/translations/source/$(lang)/$(PRJNAME)$/$(PATH_IN_MODULE).po)) -l all
+    $(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG_LIST)) $(SRCDIR)/translations/source/$(lang)/$(PRJNAME)$/$(PATH_IN_MODULE).po)) -l all
     $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $@ > $@.new
     mv $@.new $@
     @$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR)
commit 8bc2ae58d11cfc0ee2718538f6f2b606bb9fb5c1
Author: Andras Timar <atimar at suse.com>
Date:   Sat Dec 15 10:28:51 2012 +0100

    fdo#58145 dmake rule for ulf localization was not converted to use po files
    
    Change-Id: I7a47994fb74d2b7aa3e2069b91d02d7993ba993b

diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 02ed21d..69a40b3 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -638,7 +638,7 @@ $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG_LIST)) $(SRCDIR)/translations/source/$(lang)/$(PRJNAME)$/$(PATH_IN_MODULE).po)) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)