[Libreoffice-commits] .: solenv/gbuild

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Sun Mar 27 02:05:37 PDT 2011


 solenv/gbuild/AllLangResTarget.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 451a5adc67647d647a2dfb86baf2217f308e6a24
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Mar 27 11:05:17 2011 +0200

    fix regression introduced with 37705446d2eec207d9e0e3d39997792229fb8b1f
    
     * l10n should now work again (thanks timar for the hint)

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 635ee5f..61480f8 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -72,7 +72,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-I$(realpath $(dir $(3))) \
 		$(DEFS) \
 		-fp=$(1) \
-		$(realpath $(if $<,$<,$(MERGEDFILE)))" > $${RESPONSEFILE} && \
+		$(realpath $(if $(MERGEDFILE),$(MERGEDFILE),$<))" > $${RESPONSEFILE} && \
 	$(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
 	rm -rf $${RESPONSEFILE})
 


More information about the Libreoffice-commits mailing list