Commits

Anonymous committed cb72bd9

sdf2: use new merger

  • Participants
  • Parent commits ab2528f

Comments (0)

Files changed (1)

l10n/source/makefile.mk

 	@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
 
 	-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