database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Bug #35250: readline check breaks when doing vpath build

Browse Source 
Fixed several (obvious) places that don't work with vpath
build.
This commit is contained in:
Georgi Kodinov
2010-02-12 18:28:35 +02:00
parent 6f78ef71d4
commit 792fc9f784
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@@ -2711,7 +2711,7 @@ case $SYSTEM_TYPE in
fi fi
# if there is no readline, but we want to build with readline, we fail # if there is no readline, but we want to build with readline, we fail
if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"] if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"]
then then
AC_MSG_ERROR([This commercially licensed MySQL source package can't AC_MSG_ERROR([This commercially licensed MySQL source package can't
be built with libreadline. Please use --with-libedit to use be built with libreadline. Please use --with-libedit to use

4
mysql-test/Makefile.am
View File

@@ -130,12 +130,12 @@ uninstall-local:
# mtr - a shortcut for executing mysql-test-run.pl # mtr - a shortcut for executing mysql-test-run.pl
mtr: mtr:
$(RM) -f mtr $(RM) -f mtr
$(LN_S) mysql-test-run.pl mtr $(LN_S) $(srcdir)/mysql-test-run.pl mtr
# mysql-test-run - a shortcut for executing mysql-test-run.pl # mysql-test-run - a shortcut for executing mysql-test-run.pl
mysql-test-run: mysql-test-run:
$(RM) -f mysql-test-run $(RM) -f mysql-test-run
$(LN_S) mysql-test-run.pl mysql-test-run $(LN_S) $(srcdir)/mysql-test-run.pl mysql-test-run
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%

5
scripts/Makefile.am
View File

@@ -110,7 +110,8 @@ mysqlbug: ${top_builddir}/config.status mysqlbug.sh
mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
mysql_system_tables_fix.sql mysql_system_tables_fix.sql
@echo "Building $@"; @echo "Building $@";
@cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@ @cat $(srcdir)/mysql_system_tables.sql \
$(srcdir)/mysql_system_tables_fix.sql > $@
# #
# Build mysql_fix_privilege_tables_sql.c from # Build mysql_fix_privilege_tables_sql.c from
@@ -123,7 +124,7 @@ mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
sleep 2 sleep 2
$(top_builddir)/scripts/comp_sql$(EXEEXT) \ $(top_builddir)/scripts/comp_sql$(EXEEXT) \
mysql_fix_privilege_tables \ mysql_fix_privilege_tables \
$(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@
SUFFIXES = .sh SUFFIXES = .sh

8
sql/share/Makefile.am
View File

@@ -22,7 +22,7 @@ dist-hook:
test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \ test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \
$(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \ $(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \
done; \ done; \
sleep 1 ; touch $(srcdir)/*/errmsg.sys sleep 1 ; touch $(builddir)/*/errmsg.sys
$(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets $(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets
$(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(distdir)/charsets $(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(distdir)/charsets
@@ -39,11 +39,11 @@ install-data-local:
for lang in @AVAILABLE_LANGUAGES@; \ for lang in @AVAILABLE_LANGUAGES@; \
do \ do \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \
$(INSTALL_DATA) $(srcdir)/$$lang/errmsg.sys \ $(INSTALL_DATA) $(builddir)/$$lang/errmsg.sys \
$(DESTDIR)$(pkgdatadir)/$$lang/errmsg.sys; \ $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.sys; \
done done
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets
$(INSTALL_DATA) $(srcdir)/errmsg.txt \ $(INSTALL_DATA) $(builddir)/errmsg.txt \
$(DESTDIR)$(pkgdatadir)/errmsg.txt; \ $(DESTDIR)$(pkgdatadir)/errmsg.txt; \
$(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README $(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README
$(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets
@@ -53,7 +53,7 @@ uninstall-local:
@RM@ -f -r $(DESTDIR)$(pkgdatadir) @RM@ -f -r $(DESTDIR)$(pkgdatadir)
distclean-local: distclean-local:
@RM@ -f */errmsg.sys @RM@ -f $(builddir)/*/errmsg.sys
# Do nothing # Do nothing
link_sources: link_sources:

2
storage/ndb/src/common/util/Makefile.am
View File

@@ -37,7 +37,7 @@ testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
testBitmask.cpp : Bitmask.cpp testBitmask.cpp : Bitmask.cpp
rm -f testBitmask.cpp rm -f testBitmask.cpp
@LN_CP_F@ Bitmask.cpp testBitmask.cpp @LN_CP_F@ $(srcdir)/Bitmask.cpp testBitmask.cpp
testBitmask.o: $(testBitmask_SOURCES) testBitmask.o: $(testBitmask_SOURCES)
$(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $< $(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $<