* configure.in (pkgdatadir): define pkgdatadir explicitly, and

* Makefile.am (aclocaldir): do not set it explicitly, automake
does already

diff --git a/ChangeLog b/ChangeLog
index 1f07178740fc43d0b201ed67800276671f529d97..08b3d82c283a8ff57c6342c39b2cd5a7764de2b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-01-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * configure.in (pkgdatadir): define pkgdatadir explicitly, and
+       comment that automake does not need it, but libtoolize does
+       * Makefile.am (aclocaldir): do not set it explicitly, automake
+       does already
+
        * configure.in (TIMESTAMP): use mkstamp here too
 
 1999-01-27  Thomas Tanner  <tanner@gmx.de>

diff --git a/Makefile.am b/Makefile.am
index 8466e78a13c6fcbca74f22a77d3263418e544411..4f510bf83eb96c51e3916295ec83f3f3bfb6bbe1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,6 @@ pkgdata_SCRIPTS = config.guess config.sub ltconfig
 pkgdata_DATA = ltmain.sh
 
 # This macro file should be visible to Automake's aclocal.
-aclocaldir = @aclocaldir@
 aclocal_DATA = $(aclocal_macros)
 
 # The standalone libtool script, and the libtool distributor.

diff --git a/configure.in b/configure.in
index e09ed8bf3524c1e0891fb18471107195f52b5a04..e1e1a06dfd59f87690efe17349513f557a553da6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -24,7 +24,8 @@ changequote([,])
     ;;
 esac    
 
-AC_SUBST(pkgdatadir)
+pkgdatadir='${datadir}/${PACKAGE}'
+AC_SUBST(pkgdatadir) dnl automake does not need this, but libtoolize does
 aclocaldir='${datadir}/aclocal'
 AC_SUBST(aclocaldir)