diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 21:15:18 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 21:15:18 +0100 |
| commit | bd838a68d44a3adce9ae4b2c5e3e17b47eead7c1 (patch) | |
| tree | 9d2bd302f9a79d42e45cd06e21787a94e6f97c75 /lib/am/configure.am | |
| parent | 88ac92b2d5beaf4aee7d7bb4f3dc9a86da823550 (diff) | |
| parent | 6979c8e680b68dbc2b27b4db808cb037ba6aabb7 (diff) | |
| download | automake-bd838a68d44a3adce9ae4b2c5e3e17b47eead7c1.tar.gz | |
Merge branch 'micro' into minor
* micro:
dist: fix bug#18286 "distcheck fails to detect missing files"
tests: expose automake bug#18286 "distcheck fails to detect missing files"
include: fix bug in handling of user-defined makefile fragments generation
tests: expose bug in handling of user-defined makefile fragments generation
Diffstat (limited to 'lib/am/configure.am')
| -rw-r--r-- | lib/am/configure.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/am/configure.am b/lib/am/configure.am index 8f037fd1b..34ebd17ad 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -83,7 +83,11 @@ endif %?TOPDIR_P% esac; ## Avoid the "deleted header file" problem for the dependencies. -?HAVE-MAKEFILE-IN-DEPS?%MAKEFILE-IN-DEPS%: +## Add the trailing "$(am__empty)" to trick Automake into not spuriously +## complaining about "duplicated targets" in case the %MAKEFILE-IN-DEPS% +## list expands to a single target that is also declared in some +## user-defined rule. +?HAVE-MAKEFILE-IN-DEPS?%MAKEFILE-IN-DEPS% $(am__empty): DIST_COMMON += %MAKEFILE-AM% |