Commit 60607308 authored by serg@sergbook.mylan's avatar serg@sergbook.mylan

symlink, not hardlink

mkdir in Makefile, not in configure
chmod a-x
parent cf92a5aa
...@@ -772,3 +772,4 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so ...@@ -772,3 +772,4 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so
ndb/lib/libREP_API.so ndb/lib/libREP_API.so
ndb/lib/libndbclient.so ndb/lib/libndbclient.so
ndb/lib/libndbclient_extra.so ndb/lib/libndbclient_extra.so
libmysqld/discover.cc
...@@ -2228,7 +2228,6 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then ...@@ -2228,7 +2228,6 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
# For NetWare, do not need readline # For NetWare, do not need readline
echo "Skipping readline" echo "Skipping readline"
else else
mkdir include/readline
if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"] if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"]
then then
...@@ -2236,7 +2235,7 @@ then ...@@ -2236,7 +2235,7 @@ then
readline_basedir="libedit" readline_basedir="libedit"
readline_dir="$readline_topdir/$readline_basedir" readline_dir="$readline_topdir/$readline_basedir"
readline_link="\$(top_builddir)/cmd-line-utils/libedit/liblibedit.a" readline_link="\$(top_builddir)/cmd-line-utils/libedit/liblibedit.a"
readline_h_ln_cmd="\$(LN) \$(top_builddir)/cmd-line-utils/libedit/readline/*.h readline/" readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/libedit/readline/*.h readline/"
compile_libedit=yes compile_libedit=yes
AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE) AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE)
elif test "$with_readline" = "yes" elif test "$with_readline" = "yes"
...@@ -2245,7 +2244,7 @@ then ...@@ -2245,7 +2244,7 @@ then
readline_basedir="readline" readline_basedir="readline"
readline_dir="$readline_topdir/$readline_basedir" readline_dir="$readline_topdir/$readline_basedir"
readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a" readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"
readline_h_ln_cmd="\$(LN) \$(top_builddir)/cmd-line-utils/readline/*.h readline/" readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/readline/*.h readline/"
compile_readline=yes compile_readline=yes
AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE) AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE)
else else
......
...@@ -48,14 +48,16 @@ all-local: my_config.h ...@@ -48,14 +48,16 @@ all-local: my_config.h
# Since we include my_config.h it better exist from the beginning # Since we include my_config.h it better exist from the beginning
link_sources: link_sources:
$(CP) ../config.h my_config.h $(CP) ../config.h my_config.h
$(RM) -f readline/* $(RM) -fr readline/*
-mkdir readline
@readline_h_ln_cmd@ @readline_h_ln_cmd@
# Keep automake happy # Keep automake happy
my_config.h: ../config.h my_config.h: ../config.h
$(CP) ../config.h my_config.h $(CP) ../config.h my_config.h
$(RM) -f readline/* $(RM) -fr readline/*
-mkdir readline
@readline_h_ln_cmd@ @readline_h_ln_cmd@
# These files should not be included in distributions since they are # These files should not be included in distributions since they are
......
select * from mysql.user as t1, mysql.user as t2, mysql.user as t3, mysql.user as t4, mysql.user as t5, mysql.user as t6, mysql.user as t7, mysql.user as t8; select * from mysql.user as t1, mysql.user as t2, mysql.user as t3;
\ No newline at end of file
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment