[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
301-gary-set-macrodir-correctly-for-installcheck.diff
From: |
Gary V. Vaughan |
Subject: |
301-gary-set-macrodir-correctly-for-installcheck.diff |
Date: |
Thu, 10 Nov 2005 15:37:46 +0000 |
User-agent: |
quilt/0.42-1 |
Okay to commit?
Makefile.am | 6 ++++--
tests/old-m4-iface.at | 4 ++--
tests/testsuite.at | 1 -
3 files changed, 6 insertions(+), 5 deletions(-)
Index: libtool--devo--1.0/ChangeLog
from Gary V. Vaughan <address@hidden>
* tests/testsuite.ac (macrodir): Don't set it here...
* Makefile.am (BUILDCHECK_ENVIRONMENT, INSTALLCHECK_ENVIRONMENT):
...set it here to pick up files from the right place in context.
Index: libtool--devo--1.0/Makefile.am
===================================================================
--- libtool--devo--1.0.orig/Makefile.am
+++ libtool--devo--1.0/Makefile.am
@@ -389,11 +389,13 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
- LIBTOOL="$(abs_top_builddir)/libtool"
+ LIBTOOL="$(abs_top_builddir)/libtool" \
+ aclocaldir="$(abs_top_srcdir)/libltdl/m4"
INSTALLCHECK_ENVIRONMENT = \
LIBTOOLIZE="$(bindir)/`echo libtoolize | sed
'$(program_transform_name)'`" \
- LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`"
+ LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \
+ aclocaldir="$(aclocaldir)"
check-recursive: $(srcdir)/$(TESTSUITE)
Index: libtool--devo--1.0/tests/old-m4-iface.at
===================================================================
--- libtool--devo--1.0.orig/tests/old-m4-iface.at
+++ libtool--devo--1.0/tests/old-m4-iface.at
@@ -72,8 +72,8 @@ LT_AT_LIBTOOLIZE([--install])
# This is slightly bogus, since only libtool.m4 was required in aclocal.m4
# with libtool-1.5x...
AT_CHECK([test -f aclocal.m4 ||
- cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \
- "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4])
+ cat "$aclocaldir/libtool.m4" "$aclocaldir/ltoptions.m4" \
+ "$aclocaldir/ltsugar.m4" "$aclocaldir/ltversion.m4" > aclocal.m4])
LT_AT_BOOTSTRAP([ignore], [ignore], [ignore], [ignore], [--force])
Index: libtool--devo--1.0/tests/testsuite.at
===================================================================
--- libtool--devo--1.0.orig/tests/testsuite.at
+++ libtool--devo--1.0/tests/testsuite.at
@@ -25,7 +25,6 @@ m4_divert_push([PREPARE_TESTS])dnl
: ${AUTOMAKE=automake}
: ${AUTORECONF=autoreconf}
export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
-macrodir="$abs_top_srcdir/libltdl/m4"
eval `$LIBTOOL --config | grep ^EGREP=`
eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|ECHO)='`
configure_options=
--
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
- 301-gary-set-macrodir-correctly-for-installcheck.diff,
Gary V. Vaughan <=