From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 3 Feb 1999 17:36:02 +0000 (+0000)
Subject: Merged from HEAD branch:
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ec52103871e9160655e5f20c10bccf6c693d520;p=thirdparty%2Flibtool.git

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 c1ea6783d..e00b1612f 100644
--- 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 4bac3855a..f52775936 100644
--- 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 f9bb667ba..19c9dccf3 100644
--- 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)