diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-15 16:15:27 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-15 16:15:27 +0100 |
| commit | 92bd5d25c2ba94b8664202990d0152e68d440632 (patch) | |
| tree | 5129e3424a98e21299a467e4174409807dae4eb9 | |
| parent | 60fe7d3d124f9b3f3b580432f44acbc6f4bcd7b7 (diff) | |
| download | automake-92bd5d25c2ba94b8664202990d0152e68d440632.tar.gz | |
fixup: Automake installation works again
By renaming 'dist_automake_ac_DATA' to 'nobase_dist_automake_ac_DATA' in
a recent patch, we have broken the Automake installation, since m4 files
that were expected to be installed in '${prefix}/aclocal-${APIVERSION}'
are now being installed in '${prefix}/aclocal-${APIVERSION}/m4' instead.
Fix this mess.
* Makefile.am (nobase_dist_automake_ac_DATA): Rename ...
(dist_automake_ac_DATA): ... like this. And move
'm4/internal/ac-config-macro-dirs.m4' ...
(dist_automake_internal_ac_DATA): ... here.
(automake_internal_acdir): New, simply defined to
'$(automake_acdir)/internal'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 34abc5a49..8e27cd75c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -255,8 +255,7 @@ dist_am_DATA = \ ## Automake-provided m4 macros. ## ## ------------------------------ ## -nobase_dist_automake_ac_DATA = \ - m4/internal/ac-config-macro-dirs.m4 \ +dist_automake_ac_DATA = \ m4/amversion.m4 \ m4/ar-lib.m4 \ m4/as.m4 \ @@ -290,6 +289,9 @@ nobase_dist_automake_ac_DATA = \ m4/upc.m4 \ m4/vala.m4 +automake_internal_acdir = $(automake_acdir)/internal +dist_automake_internal_ac_DATA = m4/internal/ac-config-macro-dirs.m4 + dist_system_ac_DATA = m4/acdir/README # We build amversion.m4 here, instead of from config.status, |