Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e286ac99
Commit
e286ac99
authored
Jan 02, 2008
by
jperkin/jonathan@chorlton.adsl.perkin.org.uk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use pkglibdir to simplify pkgplugindir, and fix the path in a
couple of Makefiles. Continuation of the fix for bug#31736.
parent
f988a7e6
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
11 additions
and
12 deletions
+11
-12
libmysqld/Makefile.am
libmysqld/Makefile.am
+1
-1
plugin/daemon_example/Makefile.am
plugin/daemon_example/Makefile.am
+1
-1
plugin/fulltext/Makefile.am
plugin/fulltext/Makefile.am
+1
-1
scripts/Makefile.am
scripts/Makefile.am
+1
-1
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+1
-2
sql/Makefile.am
sql/Makefile.am
+1
-1
storage/archive/Makefile.am
storage/archive/Makefile.am
+1
-1
storage/blackhole/Makefile.am
storage/blackhole/Makefile.am
+1
-1
storage/example/Makefile.am
storage/example/Makefile.am
+1
-1
storage/federated/Makefile.am
storage/federated/Makefile.am
+1
-1
storage/innobase/Makefile.am
storage/innobase/Makefile.am
+1
-1
No files found.
libmysqld/Makefile.am
View file @
e286ac99
...
...
@@ -21,7 +21,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(libdir)
pkgplugindir
=
$(
libdir)
/@PACKAGE@
/plugin
pkgplugindir
=
$(
pkglibdir)
/plugin
EXTRA_DIST
=
libmysqld.def CMakeLists.txt
DEFS
=
-DEMBEDDED_LIBRARY
-DMYSQL_SERVER
\
...
...
plugin/daemon_example/Makefile.am
View file @
e286ac99
...
...
@@ -18,7 +18,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(pkglibdir)
pkgplugindir
=
$(
libdir)
/@PACKAGE@
/plugin
pkgplugindir
=
$(
pkglibdir)
/plugin
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
/sql
\
...
...
plugin/fulltext/Makefile.am
View file @
e286ac99
...
...
@@ -15,7 +15,7 @@
#Makefile.am example for a plugin
pkgplugindir
=
$(
libdir)
/@PACKAGE@
/plugin
pkgplugindir
=
$(
pkglibdir)
/plugin
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
#noinst_LTLIBRARIES= mypluglib.la
pkgplugin_LTLIBRARIES
=
mypluglib.la
...
...
scripts/Makefile.am
View file @
e286ac99
...
...
@@ -90,7 +90,7 @@ CLEANFILES = @server_scripts@ \
mysql_tableinfo
\
mysqld_multi
pkgplugindir
=
$(
libdir)
/@PACKAGE@
/plugin
pkgplugindir
=
$(
pkglibdir)
/plugin
# Default same as 'pkgdatadir', but we can override it
pkgsuppdir
=
$(datadir)
/@PACKAGE@
...
...
scripts/make_binary_distribution.sh
View file @
e286ac99
...
...
@@ -30,8 +30,7 @@
# "pkglibdir" is set to the same as "libdir"
# "pkgincludedir" is set to the same as "includedir"
# "pkgdatadir" is set to the same as "datadir"
# "pkgplugindir" is set to "@prefix@/lib/plugin",
# normally "$libdir/plugin"
# "pkgplugindir" is set to "$pkglibdir/plugin"
# "pkgsuppdir" is set to "@prefix@/support-files",
# normally the same as "datadir"
#
...
...
sql/Makefile.am
View file @
e286ac99
...
...
@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(pkglibdir)
pkgplugindir
=
$(
libdir)
/@PACKAGE@
/plugin
pkgplugindir
=
$(
pkglibdir)
/plugin
INCLUDES
=
@ZLIB_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
-I
$(top_srcdir)
/regex
-I
$(srcdir)
$(openssl_includes)
...
...
storage/archive/Makefile.am
View file @
e286ac99
...
...
@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(pkglibdir)
pkgplugindir
=
$(
libdir)
/@PACKAGE@
/plugin
pkgplugindir
=
$(
pkglibdir)
/plugin
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
/sql
\
...
...
storage/blackhole/Makefile.am
View file @
e286ac99
...
...
@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(pkglibdir)
pkgplugindir
=
$(
libdir)
/@PACKAGE@
/plugin
pkgplugindir
=
$(
pkglibdir)
/plugin
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
/sql
\
...
...
storage/example/Makefile.am
View file @
e286ac99
...
...
@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(pkglibdir)
pkgplugindir
=
$(
libdir)
/@PACKAGE@/libdir
pkgplugindir
=
$(
pkglibdir)
/plugin
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
/sql
\
...
...
storage/federated/Makefile.am
View file @
e286ac99
...
...
@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(pkglibdir)
pkgplugindir
=
$(
libdir)
/@PACKAGE@
/plugin
pkgplugindir
=
$(
pkglibdir)
/plugin
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
/sql
\
...
...
storage/innobase/Makefile.am
View file @
e286ac99
...
...
@@ -19,7 +19,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(pkglibdir)
pkgplugindir
=
$(
libdir)
/@PACKAGE@/libdir
pkgplugindir
=
$(
pkglibdir)
/plugin
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
/storage/innobase/include
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment