diff options
| author | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2008-03-06 15:13:14 +0000 |
|---|---|---|
| committer | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2008-03-06 15:13:14 +0000 |
| commit | fcdf0d11c58e7244a73eb80641dee658e3a87ef5 (patch) | |
| tree | f4537a5c57fb557b3abaff08029182ee06bbe09e /storage/example | |
| parent | 5521666f65216d832f69dc06810999a6d13cd198 (diff) | |
| parent | 14ab7bccaa26eb1f9520056f1452f79fdde076d5 (diff) | |
| download | mariadb-git-fcdf0d11c58e7244a73eb80641dee658e3a87ef5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
libmysqld/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'storage/example')
| -rw-r--r-- | storage/example/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am index 73016d24b57..4b2f165377c 100644 --- a/storage/example/Makefile.am +++ b/storage/example/Makefile.am @@ -19,6 +19,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(pkglibdir) +pkgplugindir = $(pkglibdir)/plugin INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ -I$(top_srcdir)/regex \ -I$(top_srcdir)/sql \ @@ -32,8 +33,8 @@ DEFS = @DEFS@ noinst_HEADERS = ha_example.h EXTRA_LTLIBRARIES = ha_example.la -pkglib_LTLIBRARIES = @plugin_example_shared_target@ -ha_example_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ +ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) ha_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_example_la_SOURCES = ha_example.cc |