make-git: refreshing patches

make-git/PKGBUILD

@@ -3,8 +3,8 @@
 
 pkgname=make-git
 _ver_base=4.0
-pkgver=4.0.2294.8871368
-pkgrel=2
+pkgver=4.0.2298.8411528
+pkgrel=1
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
@@ -12,16 +12,13 @@ license=('GPL3')
 provides=("make")
 conflicts=("make")
 depends=('msys2-runtime' 'sh' 'guile')
+#options=('debug' '!strip')
 makedepends=('gettext' 'gettext-devel' 'git' 'wget')
 install=$pkgname.install
 source=("$pkgname"::'git://git.savannah.gnu.org/make.git'
-        'make-autoconf.patch'
-        '0001-output.c-Fix-memory-stomp-when-need-fmtbuf.size.patch'
-        'make-bug-41341.patch')
+        'make-autoconf.patch')
 md5sums=('SKIP'
-         'e33ecebcf51947bb5ca54309b6e86c5f'
-         'b06af775e84a34248bb524104a36bc61'
-         '33c00ec9c1a4b0c2d16ef9776bb676c2')
+         'ccba99fbedbadfff09bb3fe220e9cab8')
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -31,8 +28,6 @@ pkgver() {
 prepare() {
   cd ${srcdir}/${pkgname}
   patch -p1 -i ${srcdir}/make-autoconf.patch
-  patch -p1 -i ${srcdir}/0001-output.c-Fix-memory-stomp-when-need-fmtbuf.size.patch
-  patch -p1 -i ${srcdir}/make-bug-41341.patch
   autoreconf -fi
 }
 

make-git/make-autoconf.patch

@@ -23,3 +23,15 @@
  # This test must come as early as possible after the compiler configuration
  # tests, because the choice of the file model can (in principle) affect
  # whether functions and headers are available, whether they work, etc.
+diff --git a/w32/Makefile.am b/w32/Makefile.am
+index be757fe..00d4fa6 100644
+--- a/w32/Makefile.am
++++ b/w32/Makefile.am
+@@ -14,6 +14,7 @@
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # this program.  If not, see <http://www.gnu.org/licenses/>.
++AUTOMAKE_OPTIONS = subdir-objects
+
+ noinst_LIBRARIES = libw32.a
+