Skip to content

M
mariadb
Commit 3e0b32b3 authored by unknown's avatar unknown
Browse files
Options

Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents 78021230 85613003
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
sql/Makefile.am
View file @ 3e0b32b3
...@@ -21,8 +21,7 @@ MYSQLBASEdir= $(prefix) ...@@ -21,8 +21,7 @@ MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
INCLUDES = @ZLIB_INCLUDES@ \ INCLUDES = @ZLIB_INCLUDES@ \
-I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/regex -I$(srcdir) \ -I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
$(openssl_includes)
WRAPLIBS= @WRAPLIBS@ WRAPLIBS= @WRAPLIBS@
SUBDIRS = share SUBDIRS = share
libexec_PROGRAMS = mysqld libexec_PROGRAMS = mysqld
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7