* automake.in (preprocess_file): Here,.
(handle_dist): And here.
Signed-off-by: Stefano Lattarini
---
automake.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/automake.in b/automake.in
index 43e1a90..a9c1a06 100644
--- a/automake.in
+++ b/automake.in
@@ -3811,7 +3811,7 @
commit ae1f40f55d32d5f4fe6887ba38c56c169de83d57
Merge: 03b7cf9 ae1d413
Author: Stefano Lattarini
Date: Fri Aug 10 16:51:55 2012 +0200
Merge branch 'maint'
* maint:
automake: remove an unused local variable
distcheck: more resilient against possible failures
cleanup: remove almo
* automake.in (handle_dist): Here, the '$extra_dist' variable.
Signed-off-by: Stefano Lattarini
---
automake.in | 6 --
1 file changed, 6 deletions(-)
diff --git a/automake.in b/automake.in
index e3c3d1f..8b8c405 100644
--- a/automake.in
+++ b/automake.in
@@ -3768,12 +3768,6 @@ sub handle_d
* lib/am/distdir.am (distcheck): Ensure that a failure in the commands
making the just-extracted source tree read-only cause the recipe to fail.
While at it, save a fork by creating the '_build' and '_inst' subdir
with a single mkdir invocation.
Signed-off-by: Stefano Lattarini
---
lib/am/distdi
commit 03b7cf99c697f1b9d601de50b8fcd4698d254d21
Merge: 2a7c9ae 21ec3a5
Author: Stefano Lattarini
Date: Fri Aug 10 12:51:40 2012 +0200
Merge branch 'maint'
* maint:
cleanup: remove two almost-unused global variables: {am,in}_file_name
cleanup: remove almost-unused global var
Cherry picked from commit v1.12.2-739-gbf2a8b0 of Automake-NG.
* automake.in ($am_file_name, $in_file_name): Delete these, which were
used only in the 'read_main_am_file' subroutine; instead ...
(read_main_am_file): ... modify it to only work from the '$makefile_am'
argument (which it was already
Cherry picked from commit v1.12.2-740-ga7f24eb in Automake-NG.
* automake.in ($topsrcdir): Delete, it was only used once ...
(handle_LIBOBJS_or_ALLOCA): ... in here, so it's simpler to inline
its expansion. Improve formatting of immediately surrounding code
a little while we are at it.
(initializ
* automake.in ($canonical_location): This.
(scan_autoconf_traces): Don't initialize it.
Signed-off-by: Stefano Lattarini
---
automake.in | 5 -
1 file changed, 5 deletions(-)
diff --git a/automake.in b/automake.in
index e32b761..1a94c04 100644
--- a/automake.in
+++ b/automake.in
@@ -370,8 +