mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Use pkglibdir to simplify pkgplugindir, and fix the path in a
couple of Makefiles. Continuation of the fix for bug#31736.
This commit is contained in:

parent
f988a7e600
commit
e286ac998c
@ -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 \
|
||||||
|
@ -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 \
|
||||||
|
@ -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
|
||||||
|
@ -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@
|
||||||
|
@ -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"
|
||||||
#
|
#
|
||||||
|
@ -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)
|
||||||
|
@ -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 \
|
||||||
|
@ -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 \
|
||||||
|
@ -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 \
|
||||||
|
@ -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 \
|
||||||
|
@ -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 \
|
||||||
|
Reference in New Issue
Block a user