[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4.2-49-g0569ec6
From: |
Gary V. Vaughan |
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4.2-49-g0569ec6 |
Date: |
Tue, 08 Nov 2011 13:34:49 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via 0569ec6cd2df2b10136e5701411961b83142d567 (commit)
via 04fbe0e383061675011726a8555c21bace745050 (commit)
via 0ecdf9b9edd1524061fe2267a513c33b75b84969 (commit)
from b7b68a3ce0e185d344d3cb0767867f1da5a6d4fb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0569ec6cd2df2b10136e5701411961b83142d567
Author: Gary V. Vaughan <address@hidden>
Date: Sun Nov 6 12:14:40 2011 +0700
tests: prefix absolute directory variables with 'abs_'.
Avoid any possible confusion about the contests of thes
variables compared to $aux_dir, $macro_dir and $src_dir in
configure.ac, Makefile.am, libtoolize.m4sh and others.
* tests/defs.m4sh (aux_dir, macro_dir, srcdir): Rename these...
(abs_aux_dir, abs_macro_dir, abs_srcdir): ...to these resp.
* tests/cdemo-shared-exec.test, tests/cdemo-shared-make.test,
tests/cdemo-static-exec.test, tests/cdemo-static-make.test,
tests/cdemo-undef-exec.test, tests/cdemo-undef-make.test,
tests/demo-nofast-exec.test, tests/demo-nofast-inst.test,
tests/demo-nofast-make.test, tests/demo-nofast-unst.test,
tests/demo-nopic-exec.test, tests/demo-nopic-make.test,
tests/demo-pic-exec.test, tests/demo-pic-make.test,
tests/demo-shared-exec.test, tests/demo-shared-inst.test,
tests/demo-shared-make.test, tests/demo-shared-unst.test,
tests/demo-static-exec.test, tests/demo-static-inst.test,
tests/demo-static-make.test, tests/demo-static-unst.test,
tests/depdemo-nofast-exec.test, tests/depdemo-nofast-inst.test,
tests/depdemo-nofast-make.test, tests/depdemo-nofast-unst.test,
tests/depdemo-shared-exec.test, tests/depdemo-shared-inst.test,
tests/depdemo-shared-make.test, tests/depdemo-shared-unst.test,
tests/depdemo-static-exec.test, tests/depdemo-static-inst.test,
tests/depdemo-static-make.test, tests/depdemo-static-unst.test,
tests/f77demo-shared-exec.test, tests/f77demo-shared-make.test,
tests/f77demo-static-exec.test, tests/f77demo-static-make.test,
tests/fcdemo-shared-exec.test, tests/fcdemo-shared-make.test,
tests/fcdemo-static-exec.test, tests/fcdemo-static-make.test,
tests/mdemo-shared-exec.test, tests/mdemo-shared-inst.test,
tests/mdemo-shared-make.test, tests/mdemo-shared-unst.test,
tests/mdemo-static-exec.test, tests/mdemo-static-inst.test,
tests/mdemo-static-make.test, tests/mdemo-static-unst.test,
tests/sh.test, tests/tagdemo-shared-exec.test,
tests/tagdemo-shared-make.test, tests/tagdemo-static-exec.test,
tests/tagdemo-static-make.test, tests/tagdemo-undef-exec.test,
tests/tagdemo-undef-make.test, tests/tagtrace.test: Adjust.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 04fbe0e383061675011726a8555c21bace745050
Author: Gary V. Vaughan <address@hidden>
Date: Sun Nov 6 17:55:08 2011 +0700
maint: calculate required mkinstalldirs calls during `make install'.
* Makefile.am (install-data-local): Make sure all destination
directories are in place before copying files there, without
hardcoding them.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 0ecdf9b9edd1524061fe2267a513c33b75b84969
Author: Gary V. Vaughan <address@hidden>
Date: Sun Nov 6 11:48:38 2011 +0700
maint: substitute static directory names.
By substituting just the directory name as passed to the macro,
aux_dir can be used with or without $srcdir prefix, which is
more flexible, and always means the same thing in each file,
rather than sometimes being a directory name, sometimes relative
to $top_srcdir.
* configure.ac (AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR)
(LT_CONFIG_LTDL_DIR): Don't force config.status substitutions
with unexpanded shell variables.
* Makefile.am, tests/defs.m4sh: Adjust.
Signed-off-by: Gary V. Vaughan <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 100 ++++++++++++++++++++-------------------
configure.ac | 6 +-
tests/cdemo-shared-exec.test | 2 +-
tests/cdemo-shared-make.test | 2 +-
tests/cdemo-static-exec.test | 2 +-
tests/cdemo-static-make.test | 2 +-
tests/cdemo-undef-exec.test | 2 +-
tests/cdemo-undef-make.test | 2 +-
tests/defs.m4sh | 10 ++--
tests/demo-nofast-exec.test | 2 +-
tests/demo-nofast-inst.test | 2 +-
tests/demo-nofast-make.test | 2 +-
tests/demo-nofast-unst.test | 2 +-
tests/demo-nopic-exec.test | 2 +-
tests/demo-nopic-make.test | 2 +-
tests/demo-pic-exec.test | 2 +-
tests/demo-pic-make.test | 2 +-
tests/demo-shared-exec.test | 2 +-
tests/demo-shared-inst.test | 2 +-
tests/demo-shared-make.test | 2 +-
tests/demo-shared-unst.test | 2 +-
tests/demo-static-exec.test | 2 +-
tests/demo-static-inst.test | 2 +-
tests/demo-static-make.test | 2 +-
tests/demo-static-unst.test | 2 +-
tests/depdemo-nofast-exec.test | 2 +-
tests/depdemo-nofast-inst.test | 2 +-
tests/depdemo-nofast-make.test | 2 +-
tests/depdemo-nofast-unst.test | 2 +-
tests/depdemo-shared-exec.test | 2 +-
tests/depdemo-shared-inst.test | 2 +-
tests/depdemo-shared-make.test | 2 +-
tests/depdemo-shared-unst.test | 2 +-
tests/depdemo-static-exec.test | 2 +-
tests/depdemo-static-inst.test | 2 +-
tests/depdemo-static-make.test | 2 +-
tests/depdemo-static-unst.test | 2 +-
tests/f77demo-shared-exec.test | 2 +-
tests/f77demo-shared-make.test | 2 +-
tests/f77demo-static-exec.test | 2 +-
tests/f77demo-static-make.test | 2 +-
tests/fcdemo-shared-exec.test | 2 +-
tests/fcdemo-shared-make.test | 2 +-
tests/fcdemo-static-exec.test | 2 +-
tests/fcdemo-static-make.test | 2 +-
tests/mdemo-shared-exec.test | 2 +-
tests/mdemo-shared-inst.test | 2 +-
tests/mdemo-shared-make.test | 2 +-
tests/mdemo-shared-unst.test | 2 +-
tests/mdemo-static-exec.test | 2 +-
tests/mdemo-static-inst.test | 2 +-
tests/mdemo-static-make.test | 2 +-
tests/mdemo-static-unst.test | 2 +-
tests/sh.test | 2 +-
tests/tagdemo-shared-exec.test | 2 +-
tests/tagdemo-shared-make.test | 2 +-
tests/tagdemo-static-exec.test | 2 +-
tests/tagdemo-static-make.test | 2 +-
tests/tagdemo-undef-exec.test | 2 +-
tests/tagdemo-undef-make.test | 2 +-
tests/tagtrace.test | 6 +-
61 files changed, 119 insertions(+), 117 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 66d09f2..3c9e39d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,12 +46,12 @@ EXTRA_LTLIBRARIES =
m4sh_dir = $(aux_dir)
-LT_M4SH = $(M4SH) -B '$(m4sh_dir)'
+LT_M4SH = $(M4SH) -B '$(srcdir)/$(m4sh_dir)'
# Using `cd' in backquotes may print the directory name, use this instead:
lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '.tarball-version'
+git_version_gen = '$(SHELL)' '$(srcdir)/$(aux_dir)/git-version-gen'
'.tarball-version'
rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | sed
's,-.*$$,,g'`
@@ -60,17 +60,21 @@ rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) &&
$(git_version_gen) | sed '
# ---------- #
defs_m4sh = $(tests_dir)/defs.m4sh
-general_m4sh = $(m4sh_dir)/general.m4sh
-getopt_m4sh = $(m4sh_dir)/getopt.m4sh
+general_m4sh = $(srcdir)/$(m4sh_dir)/general.m4sh
+getopt_m4sh = $(srcdir)/$(m4sh_dir)/getopt.m4sh
libtoolize_m4sh = $(srcdir)/libtoolize.m4sh
-ltmain_m4sh = $(m4sh_dir)/ltmain.m4sh
+ltmain_m4sh = $(srcdir)/$(m4sh_dir)/ltmain.m4sh
sh_files = $(general_m4sh) $(getopt_m4sh)
-build_scripts = $(aux_dir)/announce-gen $(aux_dir)/cvsu \
- $(aux_dir)/do-release-commit-and-tag \
- $(aux_dir)/gendocs.sh $(aux_dir)/git-version-gen \
- $(aux_dir)/gnu-web-doc-update $(aux_dir)/gnupload \
- $(aux_dir)/useless-if-before-free $(aux_dir)/vc-list-files
+build_scripts = $(srcdir)/$(aux_dir)/announce-gen \
+ $(srcdir)/$(aux_dir)/cvsu \
+ $(srcdir)/$(aux_dir)/do-release-commit-and-tag \
+ $(srcdir)/$(aux_dir)/gendocs.sh \
+ $(srcdir)/$(aux_dir)/git-version-gen \
+ $(srcdir)/$(aux_dir)/gnu-web-doc-update \
+ $(srcdir)/$(aux_dir)/gnupload \
+ $(srcdir)/$(aux_dir)/useless-if-before-free \
+ $(srcdir)/$(aux_dir)/vc-list-files
EXTRA_DIST += bootstrap bootstrap.conf $(build_scripts) cfg.mk maint.mk \
$(sh_files) ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \
@@ -89,10 +93,10 @@ CLEANFILES += libtool libtoolize
configure_ac = $(srcdir)/configure.ac
config_status = $(top_builddir)/config.status
libtoolize_in = $(srcdir)/libtoolize.in
-ltmain_sh = $(aux_dir)/ltmain.sh
-libtool_m4 = $(macro_dir)/libtool.m4
-ltversion_in = $(macro_dir)/ltversion.in
-ltversion_m4 = $(macro_dir)/ltversion.m4
+ltmain_sh = $(srcdir)/$(aux_dir)/ltmain.sh
+libtool_m4 = $(srcdir)/$(macro_dir)/libtool.m4
+ltversion_in = $(srcdir)/$(macro_dir)/ltversion.in
+ltversion_m4 = $(srcdir)/$(macro_dir)/ltversion.m4
EXTRA_DIST += $(libtoolize_in) $(libtoolize_m4sh) $(ltmain_m4sh) \
$(ltmain_sh) $(ltversion_in) $(ltversion_m4)
@@ -180,9 +184,9 @@ $(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(dotversion)
$(libtoolize_in): $(libtoolize_m4sh) $(sh_files) Makefile.am
$(AM_V_GEN)$(LT_M4SH) '$(libtoolize_m4sh)' | $(bootstrap_edit) > '$@'
-lt_Makefile_am = $(ltdl_dir)/Makefile.am
-lt_Makefile_in = $(ltdl_dir)/Makefile.in
-lt_Makefile_inc = $(ltdl_dir)/Makefile.inc
+lt_Makefile_am = $(srcdir)/$(ltdl_dir)/Makefile.am
+lt_Makefile_in = $(srcdir)/$(ltdl_dir)/Makefile.in
+lt_Makefile_inc = $(srcdir)/$(ltdl_dir)/Makefile.inc
$(lt_Makefile_am): $(lt_Makefile_inc)
$(AM_V_at)rm -f '$@'
@@ -325,24 +329,24 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
include libltdl/Makefile.inc
-lt_aclocal_m4 = $(ltdl_dir)/aclocal.m4
-lt_config_h_in = $(ltdl_dir)/config-h.in
-lt_configure = $(ltdl_dir)/configure
-stamp_mk = $(ltdl_dir)/stamp-mk
+lt_aclocal_m4 = $(srcdir)/$(ltdl_dir)/aclocal.m4
+lt_config_h_in = $(srcdir)/$(ltdl_dir)/config-h.in
+lt_configure = $(srcdir)/$(ltdl_dir)/configure
+stamp_mk = $(srcdir)/$(ltdl_dir)/stamp-mk
-lt_obsolete_m4 = $(macro_dir)/lt~obsolete.m4
+lt_obsolete_m4 = $(srcdir)/$(macro_dir)/lt~obsolete.m4
EXTRA_DIST += $(stamp_mk) $(lt_obsolete_m4)
$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4)
- $(AM_V_GEN)cd '$(ltdl_dir)' && $(AUTOMAKE) Makefile
+ $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOMAKE) Makefile
# Don't let unused scripts leak into the libltdl Makefile
$(stamp_mk): $(lt_Makefile_in)
- $(AM_V_at)T='$(ltdl_dir)/Makefile.tmp'; \
- for p in $(ltdl_dir)/config/*; do \
+ $(AM_V_at)T='$(srcdir)/$(ltdl_dir)/Makefile.tmp'; \
+ for p in $(srcdir)/$(ltdl_dir)/config/*; do \
test -f "$$p" || continue; \
- f=`echo "$$p" | $(SED) 's,^$(ltdl_dir)/,,'`; \
+ f=`echo "$$p" | $(SED) 's,^$(srcdir)/$(ltdl_dir)/,,'`; \
case " $(pkgaux_scripts) " in \
*" $$f "*) ;; \
*) '$(SED)' \
@@ -358,22 +362,22 @@ lt_aclocal_m4_deps = \
$(lt_obsolete_m4) \
$(ltversion_m4) \
$(libtool_m4) \
- $(macro_dir)/ltoptions.m4 \
- $(macro_dir)/ltdl.m4 \
- $(macro_dir)/ltsugar.m4 \
- $(macro_dir)/argz.m4 \
- $(ltdl_dir)/configure.ac
+ $(srcdir)/$(macro_dir)/ltoptions.m4 \
+ $(srcdir)/$(macro_dir)/ltdl.m4 \
+ $(srcdir)/$(macro_dir)/ltsugar.m4 \
+ $(srcdir)/$(macro_dir)/argz.m4 \
+ $(srcdir)/$(ltdl_dir)/configure.ac
lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps)
$(lt_aclocal_m4): $(lt_aclocal_m4_deps)
- $(AM_V_GEN)cd '$(ltdl_dir)' && $(ACLOCAL) -I m4
+ $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I m4
$(lt_configure): $(lt_configure_deps)
- $(AM_V_GEN)cd '$(ltdl_dir)' && $(AUTOCONF)
+ $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOCONF)
$(lt_config_h_in): $(lt_configure_deps)
- $(AM_V_GEN)cd '$(ltdl_dir)' && $(AUTOHEADER)
+ $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOHEADER)
$(AM_V_at)touch '$@'
@@ -466,28 +470,26 @@ install-data-local: $(lt_Makefile_in)
@$(NORMAL_INSTALL)
## Don't install over the top of an old pkgdatadir
-rm -rf '$(DESTDIR)$(pkgdatadir)'/*
-## To avoid spurious reconfiguration when the user installs these files
-## with libtoolize, we have to install them in the correct order:
## First, put a copy of the libtool m4 macros in the aclocal dir
- $(mkinstalldirs) $(DESTDIR)$(aclocaldir)
@list='$(aclocalfiles)'; for p in $$list; do \
f=`echo "$$p" |'$(SED)' 's|^.*/||'`; \
- echo " $(INSTALL_DATA) '$(macro_dir)/$$f'
'$(DESTDIR)$(aclocaldir)/$$f'"; \
- $(INSTALL_DATA) "$(macro_dir)/$$f" "$(DESTDIR)$(aclocaldir)/$$f"; \
+ d=`echo "$(DESTDIR)$(aclocaldir)/$$f" |$(SED) 's,[^/]*$$,,'`; \
+ test -d "$$d" || $(mkinstalldirs) "$$d"; \
+ echo " $(INSTALL_DATA) '$(srcdir)/$(macro_dir)/$$f'
'$(DESTDIR)$(aclocaldir)/$$f'"; \
+ $(INSTALL_DATA) "$(srcdir)/$(macro_dir)/$$f"
"$(DESTDIR)$(aclocaldir)/$$f"; \
done
## install the helper scripts
- $(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)'
- $(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)/config'
@list='$(pkgaux_scripts)' && for p in $$list; do \
- echo " $(INSTALL_SCRIPT) '$(ltdl_dir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
- $(INSTALL_SCRIPT) "$(ltdl_dir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
+ d=`echo "$(DESTDIR)$(pkgdatadir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
+ test -d "$$d" || $(mkinstalldirs) "$$d"; \
+ echo " $(INSTALL_SCRIPT) '$(srcdir)/$(ltdl_dir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
+ $(INSTALL_SCRIPT) "$(srcdir)/$(ltdl_dir)/$$p"
"$(DESTDIR)$(pkgdatadir)/$$p"; \
done
- $(INSTALL_DATA) "$(srcdir)/libltdl/config/ltmain.sh"
"$(DESTDIR)$(pkgdatadir)/config/ltmain.sh"
+ $(INSTALL_DATA) "$(ltmain_sh)"
"$(DESTDIR)$(pkgdatadir)/config/ltmain.sh"
## install the libltdl files
- $(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)/libltdl'
- $(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)/libltdl/libltdl'
- $(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)/libltdl/loaders'
@list='$(ltdldatafiles)' && for p in $$list; do \
+ d=`echo "$(DESTDIR)$(pkgdatadir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
+ test -d "$$d" || $(mkinstalldirs) "$$d"; \
echo " $(INSTALL_DATA) '$(srcdir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
$(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
done
@@ -498,8 +500,8 @@ install-data-local: $(lt_Makefile_in)
## Distribution. ##
## ------------- ##
-edit_readme_alpha = $(aux_dir)/edit-readme-alpha
-gitlog_to_changelog = $(aux_dir)/gitlog-to-changelog
+edit_readme_alpha = $(srcdir)/$(aux_dir)/edit-readme-alpha
+gitlog_to_changelog = $(srcdir)/$(aux_dir)/gitlog-to-changelog
dotserial = $(distdir)/.serial
dotversion = $(srcdir)/.version
diff --git a/configure.ac b/configure.ac
index f3be952..097361b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,11 +42,11 @@ m4_ifndef([AC_PACKAGE_URL],
# them in two places making renames error prone, and where copies
# might get out of sync.
m4_define([AC_CONFIG_AUX_DIR],
- m4_defn([AC_CONFIG_AUX_DIR])[AC_SUBST([aux_dir], ['${srcdir}/$1'])])
+ m4_defn([AC_CONFIG_AUX_DIR])[AC_SUBST([aux_dir], [$1])])
m4_define([LT_CONFIG_LTDL_DIR],
- m4_defn([LT_CONFIG_LTDL_DIR])[AC_SUBST([ltdl_dir], ['${srcdir}/$1'])])
+ m4_defn([LT_CONFIG_LTDL_DIR])[AC_SUBST([ltdl_dir], [$1])])
m4_define([AC_CONFIG_MACRO_DIR],
- m4_defn([AC_CONFIG_MACRO_DIR])[AC_SUBST([macro_dir], ['${srcdir}/$1'])])
+ m4_defn([AC_CONFIG_MACRO_DIR])[AC_SUBST([macro_dir], [$1])])
AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([libtoolize.m4sh])
diff --git a/tests/cdemo-shared-exec.test b/tests/cdemo-shared-exec.test
index 6de58fd..c784065 100755
--- a/tests/cdemo-shared-exec.test
+++ b/tests/cdemo-shared-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/cdemo-exec.test
+. $abs_srcdir/tests/cdemo-exec.test
diff --git a/tests/cdemo-shared-make.test b/tests/cdemo-shared-make.test
index cb3792c..254b3d4 100755
--- a/tests/cdemo-shared-make.test
+++ b/tests/cdemo-shared-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/cdemo-make.test
+. $abs_srcdir/tests/cdemo-make.test
diff --git a/tests/cdemo-static-exec.test b/tests/cdemo-static-exec.test
index 6de58fd..c784065 100755
--- a/tests/cdemo-static-exec.test
+++ b/tests/cdemo-static-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/cdemo-exec.test
+. $abs_srcdir/tests/cdemo-exec.test
diff --git a/tests/cdemo-static-make.test b/tests/cdemo-static-make.test
index cb3792c..254b3d4 100755
--- a/tests/cdemo-static-make.test
+++ b/tests/cdemo-static-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/cdemo-make.test
+. $abs_srcdir/tests/cdemo-make.test
diff --git a/tests/cdemo-undef-exec.test b/tests/cdemo-undef-exec.test
index 6de58fd..c784065 100755
--- a/tests/cdemo-undef-exec.test
+++ b/tests/cdemo-undef-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/cdemo-exec.test
+. $abs_srcdir/tests/cdemo-exec.test
diff --git a/tests/cdemo-undef-make.test b/tests/cdemo-undef-make.test
index cb3792c..254b3d4 100755
--- a/tests/cdemo-undef-make.test
+++ b/tests/cdemo-undef-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/cdemo-make.test
+. $abs_srcdir/tests/cdemo-make.test
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 9d8136e..56f1ecc 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -185,7 +185,7 @@ func_configure_nofail ()
my_args=${1+"$@"}
func_dirname_and_basename "`pwd`"
my_dir=$func_basename_result
- my_testdir="$srcdir/tests/$my_dir"
+ my_testdir="$abs_srcdir/tests/$my_dir"
conf_status=$EXIT_FAILURE
test -n "$my_args" && my_args=" $my_args"
@@ -349,10 +349,10 @@ func_exec ()
# Shared global variables for test scripts
prefix=./_inst-`echo "$0" | sed 's,.*/,,; s,-.*,,'`
-srcdir=`cd '@srcdir@' && pwd`
-macro_dir=`cd '@macro_dir@' && pwd`
-aux_dir=`cd '@aux_dir@' && pwd`
-scripts="$aux_dir/ltmain.m4sh $srcdir/libtoolize.m4sh"
+abs_srcdir=`cd '@srcdir@' && pwd`
+abs_macro_dir=`cd '@srcdir@/@macro_dir@' && pwd`
+abs_aux_dir=`cd '@srcdir@/@aux_dir@' && pwd`
+scripts="$abs_aux_dir/ltmain.m4sh $abs_srcdir/libtoolize.m4sh"
# Unset some MAKE... variables that may cause $MAKE to act like a
# recursively invoked sub-make. Any $MAKE invocation in a test is
diff --git a/tests/demo-nofast-exec.test b/tests/demo-nofast-exec.test
index 82e272d..6745d2e 100755
--- a/tests/demo-nofast-exec.test
+++ b/tests/demo-nofast-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-nofast-inst.test b/tests/demo-nofast-inst.test
index 02e87c1..0213f20 100755
--- a/tests/demo-nofast-inst.test
+++ b/tests/demo-nofast-inst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-inst.test
+. $abs_srcdir/tests/demo-inst.test
diff --git a/tests/demo-nofast-make.test b/tests/demo-nofast-make.test
index c902d85..04bee2f 100755
--- a/tests/demo-nofast-make.test
+++ b/tests/demo-nofast-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-nofast-unst.test b/tests/demo-nofast-unst.test
index 789a487..97a250f 100755
--- a/tests/demo-nofast-unst.test
+++ b/tests/demo-nofast-unst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-unst.test
+. $abs_srcdir/tests/demo-unst.test
diff --git a/tests/demo-nopic-exec.test b/tests/demo-nopic-exec.test
index 82e272d..6745d2e 100755
--- a/tests/demo-nopic-exec.test
+++ b/tests/demo-nopic-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-nopic-make.test b/tests/demo-nopic-make.test
index c902d85..04bee2f 100755
--- a/tests/demo-nopic-make.test
+++ b/tests/demo-nopic-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-pic-exec.test b/tests/demo-pic-exec.test
index 82e272d..6745d2e 100755
--- a/tests/demo-pic-exec.test
+++ b/tests/demo-pic-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-pic-make.test b/tests/demo-pic-make.test
index c902d85..04bee2f 100755
--- a/tests/demo-pic-make.test
+++ b/tests/demo-pic-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-shared-exec.test b/tests/demo-shared-exec.test
index 82e272d..6745d2e 100755
--- a/tests/demo-shared-exec.test
+++ b/tests/demo-shared-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-shared-inst.test b/tests/demo-shared-inst.test
index 02e87c1..0213f20 100755
--- a/tests/demo-shared-inst.test
+++ b/tests/demo-shared-inst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-inst.test
+. $abs_srcdir/tests/demo-inst.test
diff --git a/tests/demo-shared-make.test b/tests/demo-shared-make.test
index c902d85..04bee2f 100755
--- a/tests/demo-shared-make.test
+++ b/tests/demo-shared-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-shared-unst.test b/tests/demo-shared-unst.test
index 789a487..97a250f 100755
--- a/tests/demo-shared-unst.test
+++ b/tests/demo-shared-unst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-unst.test
+. $abs_srcdir/tests/demo-unst.test
diff --git a/tests/demo-static-exec.test b/tests/demo-static-exec.test
index 82e272d..6745d2e 100755
--- a/tests/demo-static-exec.test
+++ b/tests/demo-static-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-static-inst.test b/tests/demo-static-inst.test
index 02e87c1..0213f20 100755
--- a/tests/demo-static-inst.test
+++ b/tests/demo-static-inst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-inst.test
+. $abs_srcdir/tests/demo-inst.test
diff --git a/tests/demo-static-make.test b/tests/demo-static-make.test
index c902d85..04bee2f 100755
--- a/tests/demo-static-make.test
+++ b/tests/demo-static-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-static-unst.test b/tests/demo-static-unst.test
index 789a487..97a250f 100755
--- a/tests/demo-static-unst.test
+++ b/tests/demo-static-unst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/demo-unst.test
+. $abs_srcdir/tests/demo-unst.test
diff --git a/tests/depdemo-nofast-exec.test b/tests/depdemo-nofast-exec.test
index 5b14104..36dfc6c 100755
--- a/tests/depdemo-nofast-exec.test
+++ b/tests/depdemo-nofast-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-exec.test
+. $abs_srcdir/tests/depdemo-exec.test
diff --git a/tests/depdemo-nofast-inst.test b/tests/depdemo-nofast-inst.test
index b22013e..4b7663c 100755
--- a/tests/depdemo-nofast-inst.test
+++ b/tests/depdemo-nofast-inst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-inst.test
+. $abs_srcdir/tests/depdemo-inst.test
diff --git a/tests/depdemo-nofast-make.test b/tests/depdemo-nofast-make.test
index e8cb467..6d49dee 100755
--- a/tests/depdemo-nofast-make.test
+++ b/tests/depdemo-nofast-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-make.test
+. $abs_srcdir/tests/depdemo-make.test
diff --git a/tests/depdemo-nofast-unst.test b/tests/depdemo-nofast-unst.test
index f3ccf3f..e2c258d 100755
--- a/tests/depdemo-nofast-unst.test
+++ b/tests/depdemo-nofast-unst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-unst.test
+. $abs_srcdir/tests/depdemo-unst.test
diff --git a/tests/depdemo-shared-exec.test b/tests/depdemo-shared-exec.test
index 5b14104..36dfc6c 100755
--- a/tests/depdemo-shared-exec.test
+++ b/tests/depdemo-shared-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-exec.test
+. $abs_srcdir/tests/depdemo-exec.test
diff --git a/tests/depdemo-shared-inst.test b/tests/depdemo-shared-inst.test
index b22013e..4b7663c 100755
--- a/tests/depdemo-shared-inst.test
+++ b/tests/depdemo-shared-inst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-inst.test
+. $abs_srcdir/tests/depdemo-inst.test
diff --git a/tests/depdemo-shared-make.test b/tests/depdemo-shared-make.test
index e8cb467..6d49dee 100755
--- a/tests/depdemo-shared-make.test
+++ b/tests/depdemo-shared-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-make.test
+. $abs_srcdir/tests/depdemo-make.test
diff --git a/tests/depdemo-shared-unst.test b/tests/depdemo-shared-unst.test
index f3ccf3f..e2c258d 100755
--- a/tests/depdemo-shared-unst.test
+++ b/tests/depdemo-shared-unst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-unst.test
+. $abs_srcdir/tests/depdemo-unst.test
diff --git a/tests/depdemo-static-exec.test b/tests/depdemo-static-exec.test
index 5b14104..36dfc6c 100755
--- a/tests/depdemo-static-exec.test
+++ b/tests/depdemo-static-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-exec.test
+. $abs_srcdir/tests/depdemo-exec.test
diff --git a/tests/depdemo-static-inst.test b/tests/depdemo-static-inst.test
index b22013e..4b7663c 100755
--- a/tests/depdemo-static-inst.test
+++ b/tests/depdemo-static-inst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-inst.test
+. $abs_srcdir/tests/depdemo-inst.test
diff --git a/tests/depdemo-static-make.test b/tests/depdemo-static-make.test
index e8cb467..6d49dee 100755
--- a/tests/depdemo-static-make.test
+++ b/tests/depdemo-static-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-make.test
+. $abs_srcdir/tests/depdemo-make.test
diff --git a/tests/depdemo-static-unst.test b/tests/depdemo-static-unst.test
index f3ccf3f..e2c258d 100755
--- a/tests/depdemo-static-unst.test
+++ b/tests/depdemo-static-unst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/depdemo-unst.test
+. $abs_srcdir/tests/depdemo-unst.test
diff --git a/tests/f77demo-shared-exec.test b/tests/f77demo-shared-exec.test
index b88eb16..b9fdb03 100755
--- a/tests/f77demo-shared-exec.test
+++ b/tests/f77demo-shared-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/f77demo-exec.test
+. $abs_srcdir/tests/f77demo-exec.test
diff --git a/tests/f77demo-shared-make.test b/tests/f77demo-shared-make.test
index e68f6de..bee5491 100755
--- a/tests/f77demo-shared-make.test
+++ b/tests/f77demo-shared-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/f77demo-make.test
+. $abs_srcdir/tests/f77demo-make.test
diff --git a/tests/f77demo-static-exec.test b/tests/f77demo-static-exec.test
index b88eb16..b9fdb03 100755
--- a/tests/f77demo-static-exec.test
+++ b/tests/f77demo-static-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/f77demo-exec.test
+. $abs_srcdir/tests/f77demo-exec.test
diff --git a/tests/f77demo-static-make.test b/tests/f77demo-static-make.test
index e68f6de..bee5491 100755
--- a/tests/f77demo-static-make.test
+++ b/tests/f77demo-static-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/f77demo-make.test
+. $abs_srcdir/tests/f77demo-make.test
diff --git a/tests/fcdemo-shared-exec.test b/tests/fcdemo-shared-exec.test
index 46ea71f..84b20a0 100755
--- a/tests/fcdemo-shared-exec.test
+++ b/tests/fcdemo-shared-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/fcdemo-exec.test
+. $abs_srcdir/tests/fcdemo-exec.test
diff --git a/tests/fcdemo-shared-make.test b/tests/fcdemo-shared-make.test
index 5fc2c37..3c20e3f 100755
--- a/tests/fcdemo-shared-make.test
+++ b/tests/fcdemo-shared-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/fcdemo-make.test
+. $abs_srcdir/tests/fcdemo-make.test
diff --git a/tests/fcdemo-static-exec.test b/tests/fcdemo-static-exec.test
index 46ea71f..84b20a0 100755
--- a/tests/fcdemo-static-exec.test
+++ b/tests/fcdemo-static-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/fcdemo-exec.test
+. $abs_srcdir/tests/fcdemo-exec.test
diff --git a/tests/fcdemo-static-make.test b/tests/fcdemo-static-make.test
index 5fc2c37..3c20e3f 100755
--- a/tests/fcdemo-static-make.test
+++ b/tests/fcdemo-static-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/fcdemo-make.test
+. $abs_srcdir/tests/fcdemo-make.test
diff --git a/tests/mdemo-shared-exec.test b/tests/mdemo-shared-exec.test
index d20ae64..17240b0 100755
--- a/tests/mdemo-shared-exec.test
+++ b/tests/mdemo-shared-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/mdemo-exec.test
+. $abs_srcdir/tests/mdemo-exec.test
diff --git a/tests/mdemo-shared-inst.test b/tests/mdemo-shared-inst.test
index 81e7b60..7b8f7a6 100755
--- a/tests/mdemo-shared-inst.test
+++ b/tests/mdemo-shared-inst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/mdemo-inst.test
+. $abs_srcdir/tests/mdemo-inst.test
diff --git a/tests/mdemo-shared-make.test b/tests/mdemo-shared-make.test
index 490230e..ef661d8 100755
--- a/tests/mdemo-shared-make.test
+++ b/tests/mdemo-shared-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/mdemo-make.test
+. $abs_srcdir/tests/mdemo-make.test
diff --git a/tests/mdemo-shared-unst.test b/tests/mdemo-shared-unst.test
index 6f1cbae..100ab8e 100755
--- a/tests/mdemo-shared-unst.test
+++ b/tests/mdemo-shared-unst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/mdemo-unst.test
+. $abs_srcdir/tests/mdemo-unst.test
diff --git a/tests/mdemo-static-exec.test b/tests/mdemo-static-exec.test
index d20ae64..17240b0 100755
--- a/tests/mdemo-static-exec.test
+++ b/tests/mdemo-static-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/mdemo-exec.test
+. $abs_srcdir/tests/mdemo-exec.test
diff --git a/tests/mdemo-static-inst.test b/tests/mdemo-static-inst.test
index 81e7b60..7b8f7a6 100755
--- a/tests/mdemo-static-inst.test
+++ b/tests/mdemo-static-inst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/mdemo-inst.test
+. $abs_srcdir/tests/mdemo-inst.test
diff --git a/tests/mdemo-static-make.test b/tests/mdemo-static-make.test
index 490230e..ef661d8 100755
--- a/tests/mdemo-static-make.test
+++ b/tests/mdemo-static-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/mdemo-make.test
+. $abs_srcdir/tests/mdemo-make.test
diff --git a/tests/mdemo-static-unst.test b/tests/mdemo-static-unst.test
index 6f1cbae..100ab8e 100755
--- a/tests/mdemo-static-unst.test
+++ b/tests/mdemo-static-unst.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/mdemo-unst.test
+. $abs_srcdir/tests/mdemo-unst.test
diff --git a/tests/sh.test b/tests/sh.test
index 2435ab2..3382dad 100755
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -121,7 +121,7 @@ done
# Check for correct usage of $cc_basename.
# redirect stderr so we also barf when sed issues diagnostics.
-for s in "$macro_dir/libtool.m4"
+for s in "$abs_macro_dir/libtool.m4"
do
if $SED -n '/case \$cc_basename in/,/esac/ {
/^[ ]*[a-zA-Z][a-zA-Z0-9+]*[^*][ ]*)/p
diff --git a/tests/tagdemo-shared-exec.test b/tests/tagdemo-shared-exec.test
index ecf553a..43338b0 100755
--- a/tests/tagdemo-shared-exec.test
+++ b/tests/tagdemo-shared-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/tagdemo-exec.test
+. $abs_srcdir/tests/tagdemo-exec.test
diff --git a/tests/tagdemo-shared-make.test b/tests/tagdemo-shared-make.test
index 9ffbd49..6add5f1 100755
--- a/tests/tagdemo-shared-make.test
+++ b/tests/tagdemo-shared-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/tagdemo-make.test
+. $abs_srcdir/tests/tagdemo-make.test
diff --git a/tests/tagdemo-static-exec.test b/tests/tagdemo-static-exec.test
index ecf553a..43338b0 100755
--- a/tests/tagdemo-static-exec.test
+++ b/tests/tagdemo-static-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/tagdemo-exec.test
+. $abs_srcdir/tests/tagdemo-exec.test
diff --git a/tests/tagdemo-static-make.test b/tests/tagdemo-static-make.test
index 9ffbd49..6add5f1 100755
--- a/tests/tagdemo-static-make.test
+++ b/tests/tagdemo-static-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/tagdemo-make.test
+. $abs_srcdir/tests/tagdemo-make.test
diff --git a/tests/tagdemo-undef-exec.test b/tests/tagdemo-undef-exec.test
index ecf553a..43338b0 100755
--- a/tests/tagdemo-undef-exec.test
+++ b/tests/tagdemo-undef-exec.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/tagdemo-exec.test
+. $abs_srcdir/tests/tagdemo-exec.test
diff --git a/tests/tagdemo-undef-make.test b/tests/tagdemo-undef-make.test
index 9ffbd49..6add5f1 100755
--- a/tests/tagdemo-undef-make.test
+++ b/tests/tagdemo-undef-make.test
@@ -1,3 +1,3 @@
#! /bin/sh
. tests/defs || exit 1
-. $srcdir/tests/tagdemo-make.test
+. $abs_srcdir/tests/tagdemo-make.test
diff --git a/tests/tagtrace.test b/tests/tagtrace.test
index 4799747..3c32333 100755
--- a/tests/tagtrace.test
+++ b/tests/tagtrace.test
@@ -24,7 +24,7 @@
. tests/defs || exit 1
-: ${fnord=$srcdir/fnord$$}
+: ${fnord=$abs_srcdir/fnord$$}
$AUTOCONF --version > /dev/null 2>&1 || func_skip "This test requires GNU
Autoconf"
if touch $fnord; then
@@ -33,7 +33,7 @@ else
func_skip "This test requires write access to the source tree"
fi
-( cd "$srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) >/dev/null
+( cd "$abs_srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) >/dev/null
ret=$?
if test $ret -eq 63 || test $ret -eq 1; then
func_error "This test requires the same Autoconf version"
@@ -46,7 +46,7 @@ fi
set -e
# Retrieve the list of tags supported by our main libtool script.
-traced_tags=`cd "$srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1'`
+traced_tags=`cd "$abs_srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1'`
test -n "$traced_tags"
hooks/post-receive
--
GNU Libtool
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4.2-49-g0569ec6,
Gary V. Vaughan <=