# HG changeset patch
# User Ivo Hinkelmann <ihi@openoffice.org>
# Date 1303297403 -7200
# Node ID cb72bd9ad43d9a9bd81fca44a4d8eb58e4978992
# Parent  ab2528fb13c81e636d17d50cf7a4bea09fe0e86a
sdf2: use new merger

diff --git a/l10n/source/makefile.mk b/l10n/source/makefile.mk
--- a/l10n/source/makefile.mk
+++ b/l10n/source/makefile.mk
@@ -38,7 +38,7 @@
 	@echo "Nothing to do - en-US only build."
 .ELSE
 
-all_sdfs:=$(shell cd $(PRJ)/source && ls -1 */localize.sdf)
+all_sdfs:=$(shell cd $(PRJ)/source && ls -1 */localize.sdf2)
 
 .INCLUDE .IGNORE : $(COMMONMISC)/sdf/lock.mk
 
@@ -52,6 +52,6 @@
 	-rm -rf $(COMMONMISC)/sdf$(INPATH)_begone
 	-$(MKDIRHIER) $(COMMONMISC)/sdf
 .ENDIF			# "$(L10n_LOCK)" != "YES"
-	$(PERL) $(SOLARVER)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)/sdf && $(TOUCH) $@
+	python $(SOLARVER)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge3.py --sdf2files $(mktmp $<) --sdf2identfile ident.sdf2 --mergedir $(COMMONMISC)/sdf && $(TOUCH) $@
     $(COPY) $(PRJ)/localization_present.mk $(PRJ)/$(COMMON_OUTDIR)$(PROEXT)/inc
 .ENDIF
