fixup: Automake installation works again
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 15 Nov 2012 15:15:27 +0000 (16:15 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 15 Nov 2012 15:15:27 +0000 (16:15 +0100)
commit92bd5d25c2ba94b8664202990d0152e68d440632
tree5129e3424a98e21299a467e4174409807dae4eb9
parent60fe7d3d124f9b3f3b580432f44acbc6f4bcd7b7
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>
Makefile.am