[PATCH] Change in core[libreoffice-4-0]: lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of a...

[Petr Mladek (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1810

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/1810/1

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
---
M bin/lo-pack-sources
1 file changed, 5 insertions(+), 5 deletions(-)



diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 5341af5..de6a4be 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -131,15 +131,15 @@
         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 @@
     # 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;

-- 
To view, visit https://gerrit.libreoffice.org/1810
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia253b19566eeda31a1190a4fa7c543f7ffb63bfb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Petr Mladek <pmladek at suse.cz>