mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
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.
This commit is contained in:
parent
1b0d2eefb7
commit
e8d4f1f2fa
2 changed files with 5 additions and 3 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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@
|
||||
|
||||
|
|
Loading…
Reference in a new issue