summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2013-01-22 17:35:46 +0100
committerPetr Mladek <pmladek@suse.cz>2013-01-23 10:30:29 +0100
commit6a6ced96a3b3bb2ba833da538825e493128d6bb9 (patch)
treec25a827725158ae4275fb4c05db752c1fef4baa5 /bin
parent835be9046c2a4726fc88b031517f978b98a492f4 (diff)
lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of autoreconf
autogen.sh runs the needed tools with the right include paths Change-Id: Ia253b19566eeda31a1190a4fa7c543f7ffb63bfb Reviewed-on: https://gerrit.libreoffice.org/1810 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/lo-pack-sources10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 5341af5bc101..de6a4be9abb4 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -131,15 +131,15 @@ sub generate_lo_module_changelog($$$)
die "Error: generating failed: $!\n";
}
-sub run_autoreconf($$)
+sub run_autogen($$)
{
my ($dir, $module) = @_;
- print "Running autoreconf for $module...\n";
+ print "Running autogen for $module...\n";
system ("cd $dir && " .
- "autoreconf -f -i && " .
+ "NOCONFIGURE=1 ./autogen.sh && " .
"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($$)
@@ -266,7 +266,7 @@ sub prepare_module_sources($$$$)
# prepare sources
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);
- 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');
return $temp_dir;