Skip to content

M
MariaDB
Commit e286ac99 authored by jperkin/jonathan@chorlton.adsl.perkin.org.uk's avatar jperkin/jonathan@chorlton.adsl.perkin.org.uk
Browse files
Options

Use pkglibdir to simplify pkgplugindir, and fix the path in a 

couple of Makefiles.  Continuation of the fix for bug#31736.
parent f988a7e6
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 12 deletions
libmysqld/Makefile.am
View file @ e286ac99
...@@ -21,7 +21,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -21,7 +21,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(libdir) MYSQLLIBdir= $(libdir)
pkgplugindir = $(libdir)/@PACKAGE@/plugin pkgplugindir = $(pkglibdir)/plugin
EXTRA_DIST = libmysqld.def CMakeLists.txt EXTRA_DIST = libmysqld.def CMakeLists.txt
DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
......
plugin/daemon_example/Makefile.am
View file @ e286ac99
...@@ -18,7 +18,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -18,7 +18,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(libdir)/@PACKAGE@/plugin pkgplugindir = $(pkglibdir)/plugin
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
......
plugin/fulltext/Makefile.am
View file @ e286ac99
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#Makefile.am example for a plugin #Makefile.am example for a plugin
pkgplugindir=$(libdir)/@PACKAGE@/plugin pkgplugindir=$(pkglibdir)/plugin
INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include
#noinst_LTLIBRARIES= mypluglib.la #noinst_LTLIBRARIES= mypluglib.la
pkgplugin_LTLIBRARIES= mypluglib.la pkgplugin_LTLIBRARIES= mypluglib.la
......
scripts/Makefile.am
View file @ e286ac99
...@@ -90,7 +90,7 @@ CLEANFILES = @server_scripts@ \ ...@@ -90,7 +90,7 @@ CLEANFILES = @server_scripts@ \
mysql_tableinfo \ mysql_tableinfo \
mysqld_multi mysqld_multi
pkgplugindir = $(libdir)/@PACKAGE@/plugin pkgplugindir = $(pkglibdir)/plugin
# Default same as 'pkgdatadir', but we can override it # Default same as 'pkgdatadir', but we can override it
pkgsuppdir = $(datadir)/@PACKAGE@ pkgsuppdir = $(datadir)/@PACKAGE@
......
scripts/make_binary_distribution.sh
View file @ e286ac99
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
# "pkglibdir" is set to the same as "libdir" # "pkglibdir" is set to the same as "libdir"
# "pkgincludedir" is set to the same as "includedir" # "pkgincludedir" is set to the same as "includedir"
# "pkgdatadir" is set to the same as "datadir" # "pkgdatadir" is set to the same as "datadir"
# "pkgplugindir" is set to "@prefix@/lib/plugin", # "pkgplugindir" is set to "$pkglibdir/plugin"
# normally "$libdir/plugin"
# "pkgsuppdir" is set to "@prefix@/support-files", # "pkgsuppdir" is set to "@prefix@/support-files",
# normally the same as "datadir" # normally the same as "datadir"
# #
......
sql/Makefile.am
View file @ e286ac99
...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(libdir)/@PACKAGE@/plugin pkgplugindir = $(pkglibdir)/plugin
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) $(openssl_includes) -I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
......
storage/archive/Makefile.am
View file @ e286ac99
...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(libdir)/@PACKAGE@/plugin pkgplugindir = $(pkglibdir)/plugin
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
......
storage/blackhole/Makefile.am
View file @ e286ac99
...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(libdir)/@PACKAGE@/plugin pkgplugindir = $(pkglibdir)/plugin
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
......
storage/example/Makefile.am
View file @ e286ac99
...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(libdir)/@PACKAGE@/libdir pkgplugindir = $(pkglibdir)/plugin
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
......
storage/federated/Makefile.am
View file @ e286ac99
...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(libdir)/@PACKAGE@/plugin pkgplugindir = $(pkglibdir)/plugin
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
......
storage/innobase/Makefile.am
View file @ e286ac99
...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(libdir)/@PACKAGE@/libdir pkgplugindir = $(pkglibdir)/plugin
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/storage/innobase/include \ -I$(top_srcdir)/storage/innobase/include \
......
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