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

lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of autoreconf

Browse Source 
autogen.sh runs the needed tools with the right include paths

Change-Id: Ia253b19566eeda31a1190a4fa7c543f7ffb63bfb
This commit is contained in:
Petr Mladek
2013-01-22 17:35:46 +01:00
parent 805433ed48
commit ffd2cc342f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/lo-pack-sources
View File

@@ -131,15 +131,15 @@ sub generate_lo_module_changelog($$$)
die "Error: generating failed: $!\n"; die "Error: generating failed: $!\n";
} }
sub run_autoreconf($$) sub run_autogen($$)
{ {
my ($dir, $module) = @_; my ($dir, $module) = @_;
print "Running autoreconf for $module...\n"; print "Running autogen for $module...\n";
system ("cd $dir && " . system ("cd $dir && " .
"autoreconf -f -i && " . "NOCONFIGURE=1 ./autogen.sh && " .
"rm -rf autom4te.cache && " . "rm -rf autom4te.cache && " .
"cd - >/dev/null 2>&1") && die "Error: autoreconf failed: $!\n"; "cd - >/dev/null 2>&1") && die "Error: autogen failed: $!\n";
} }
sub generate_sources_version_file($$) sub generate_sources_version_file($$)
@@ -266,7 +266,7 @@ sub prepare_module_sources($$$$)
# prepare sources # prepare sources
my $temp_dir = copy_lo_module_to_tempdir($source_dir, $module, $lo_topdir_name); my $temp_dir = copy_lo_module_to_tempdir($source_dir, $module, $lo_topdir_name);
generate_lo_module_changelog($source_dir, "$temp_dir/$lo_topdir_name", $module); generate_lo_module_changelog($source_dir, "$temp_dir/$lo_topdir_name", $module);
run_autoreconf("$temp_dir/$lo_topdir_name", $module) if ($module eq 'core'); run_autogen("$temp_dir/$lo_topdir_name", $module) if ($module eq 'core');
generate_sources_version_file("$temp_dir/$lo_topdir_name", $release_version) if ($module eq 'core'); generate_sources_version_file("$temp_dir/$lo_topdir_name", $release_version) if ($module eq 'core');
return $temp_dir; return $temp_dir;