From cb0d6611a39a78dae3fc7badc0f46b18653ce418 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 9 Mar 2010 22:51:36 +0100 Subject: [PATCH] Bug#51607: Automake distcheck target broken. Reason for the error was that ./configure wrapper script was not safe for VPATH builds used by "make distcheck", specifically it expected configure.am to be in the current directory. Fix changes configure wrapper to resolve script names relative to configure script path. Also, use $top_srcdir/configure.am instead of configure.am in dist-hook to be more VPATH friendly. --- BUILD/choose_configure.sh | 5 +++-- Makefile.am | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BUILD/choose_configure.sh b/BUILD/choose_configure.sh index 476b8b51657..80423205274 100644 --- a/BUILD/choose_configure.sh +++ b/BUILD/choose_configure.sh @@ -5,10 +5,11 @@ # Ensure cmake and perl are there cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no perl --version >/dev/null 2>&1 || HAVE_CMAKE=no +scriptdir=`dirname $0` if test "$HAVE_CMAKE" = "no" then - sh ./configure.am "$@" + sh $scriptdir/configure.am "$@" else - perl ./cmake/configure.pl "$@" + perl $scriptdir/cmake/configure.pl "$@" fi diff --git a/Makefile.am b/Makefile.am index f64b26602d7..fbb7605493e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,8 @@ dist-hook: --datadir=$(distdir)/win/data \ --srcdir=$(top_srcdir) storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI - test ! -f configure.am || $(INSTALL_DATA) configure.am $(distdir) + test ! -f $(top_srcdir)/configure.am || \ + $(INSTALL_DATA) $(top_srcdir)/configure.am $(distdir) all-local: @ABI_CHECK@