aclocal cannot find /usr/local/share/aclocal-1.5

[Pavel Roskin]

Hi, Tom!

Your recent changes break Automake.  In the default configuration, the 
data files are installed to /usr/local/share/aclocal-1.5c and 
/usr/local/share/automake-1.5.  However, when I run aclocal, it looks for 
files in /usr/local/share/aclocal-1.5 and cannot find them:

aclocal: couldn't open directory `/usr/local/share/aclocal-1.5': No such 
file or directory

Either the aclocal files should be installed in 
$(datadir)/aclocal-$(APIVERSION) or aclocal should look fort them in 
$(datadir)/aclocal-$(VERSION)

If the former is correct, then the following patch would help:

=========================
--- m4/Makefile.am
+++ m4/Makefile.am
@@ -19,7 +19,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-m4datadir = $(datadir)/aclocal-$(VERSION)
+m4datadir = $(datadir)/aclocal-$(APIVERSION)
 
 dist_m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
 dmalloc.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 lispdir.m4 \
=========================

Changelog:
        * m4/Makefile.am (m4datadir): Use APIVERSION.

-- 
Regards,
Pavel Roskin