Project

General

Profile

Actions

Bug #245

closed

merge will try to rewrite AM_INIT_AUTOMAKE

Added by Martin Jacquet about 4 years ago. Updated about 4 years ago.

Status:
Closed
Priority:
Low
Assignee:
-

Description

I added subdir-objects option to AM_INIT_AUTOMAKE in order to properly include the subdirectories in the codels folder.

The genom merge tool will try to rewrite this line each time that I call it, applying this patch:


merging ./configure.ac
--- ./configure.ac    Fri Mar 13 22:13:03 CET 2020
+++ ./configure.ac    Fri Mar 27 13:21:39 CET 2020
@@ -32,8 +32,8 @@
 AC_CONFIG_MACRO_DIR([autoconf])
 AC_CONFIG_AUX_DIR([autoconf])
 AC_CONFIG_HEADERS([autoconf/acmpc.h])
-AM_INIT_AUTOMAKE([foreign no-define subdir-objects])
-
+AM_INIT_AUTOMAKE([foreign no-define])
+
 dnl Compilers
 dnl
 LT_INIT([disable-static])
Apply this patch [y,n,c,a,q,?]?

The other lines manually added to the configure.ac are not being rewritten while merging.

Actions

Also available in: Atom PDF