From: Wayne Davison <wayned@samba.org>
Date: Sun, 12 Apr 2009 22:18:33 +0000 (-0700)
Subject: Changed the commands used to "make gen" without any stoppage.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/bbef6566cd2fb9f12a52f6c61d27efe84695f2c6?hp=9be5093726d73826b63f18435940bbe1afddc66c

Changed the commands used to "make gen" without any stoppage.
---

diff --git a/packaging/patch-update b/packaging/patch-update
index 46d9ff8f..15d1b6c3 100755
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -10,6 +10,7 @@ use Getopt::Long;
 
 my $patches_dir = 'patches';
 my $tmp_dir = "patches.$$";
+my $make_gen_cmd = 'make -f prepare-source.mak conf && ./config.status && make gen';
 
 &Getopt::Long::Configure('bundling');
 &usage if !&GetOptions(
@@ -50,7 +51,7 @@ close IN;
 if ($incl_generated_files) {
     die "'$tmp_dir' must not exist in the current directory.\n" if -e $tmp_dir;
     mkdir($tmp_dir, 0700) or die "Unable to mkdir($tmp_dir): $!\n";
-    system "./config.status Makefile && make gen && rsync -a @extra_files $tmp_dir/master/" and exit 1;
+    system "$make_gen_cmd && rsync -a @extra_files $tmp_dir/master/" and exit 1;
 }
 our $last_touch = time;
 
@@ -158,7 +159,7 @@ sub update_patch
     print OUT $description{$patch}, "\n";
 
     if ($incl_generated_files) {
-	system "./config.status Makefile && make gen && rsync -a @extra_files $tmp_dir/$patch/" and exit 1;
+	system "$make_gen_cmd && rsync -a @extra_files $tmp_dir/$patch/" and exit 1;
     }
     $last_touch = time;