Merged from HEAD branch:

* 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 c1ea6783de40d9b3644f4dcf30f1a28b355d762e..e00b1612fdd603f8e75ede893f2bd0b4d90781c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,14 @@
        yes' implies gnu ld, otherwise MSVC++ (which I haven't tested
        since I inheritted the code from Ian Lance Taylor btw!) is implied.
        
+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
+       
 1999-01-26  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
        
        * configure.in:  It seems Alexandre accidentally removed the

diff --git a/Makefile.am b/Makefile.am
index 4bac3855a7f5539c4994f0c63dc77d7c78f0c091..f527759363cd5961a6d9413e860a6da69172b48b 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 f9bb667ba732bab683ecda954e2ee4ed7f2275a6..19c9dccf3fe12fd75d06486ceb4ac89434f5a402 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)