mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make update_tree.pl work with internal xmllint

Browse Source 
Change-Id: I5985e484ffd031e0526c2de7765df113b51bb7e8
This commit is contained in:
Stephan Bergmann
2012-09-11 14:23:33 +02:00
parent 04f94ba53f
commit a0ca9451c7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
l10ntools/scripts/update_tree.pl
View File

@@ -44,7 +44,7 @@ terminate() if ( ! defined $inpath );
my $destpath = $inpath;
my $with_lang = $ARGV[1];
my $xmllint = $ENV{XMLLINT};
my $xmllint = $ENV{XMLLINT} || "$ENV{OUTDIR_FOR_BUILD}/bin/xmllint";
$tree_target_prefix = $ARGV[4];

5
solenv/gbuild/ExtensionTarget.mk
View File

@@ -40,7 +40,10 @@ gb_ExtensionTarget_PROPMERGECOMMAND := \
$(PERL) $(gb_ExtensionTarget_PROPMERGETARGET)
gb_ExtensionTarget_UPDATETREETARGET := $(SRCDIR)/l10ntools/scripts/update_tree.pl
gb_ExtensionTarget_UPDATETREECOMMAND := $(PERL) $(gb_ExtensionTarget_UPDATETREETARGET)
gb_ExtensionTarget_UPDATETREECOMMAND := \
$(gb_Helper_set_ld_path) $(PERL) $(gb_ExtensionTarget_UPDATETREETARGET)
# update_tree.pl calls xmllint, which needs $(gb_Helper_set_ld_path) if it
# is the internal one
gb_ExtensionTarget_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex)
gb_ExtensionTarget_HELPEXCOMMAND := \