From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Wed, 27 Jan 1999 03:04:34 +0000 (+0000)
Subject: * configure.in (pkgdatadir): define pkgdatadir explicitly, and
X-Git-Tag: release-1-2f~165
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec63fb9c6b87ee7d19dd2a1820355733a9883a3c;p=thirdparty%2Flibtool.git

* 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 1f0717874..08b3d82c2 100644
--- 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 8466e78a1..4f510bf83 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 e09ed8bf3..e1e1a06df 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)