diff options
| author | unknown <joerg@trift2.> | 2008-03-27 12:45:16 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2008-03-27 12:45:16 +0100 |
| commit | 797a2d68f81bc931170d71d066d204c4071653b6 (patch) | |
| tree | ad0f3904109b50a452c4e481659cd1eec465d3e9 /storage/federated | |
| parent | 321f392f629479eedf63062f85283e911ce05d7e (diff) | |
| parent | db9df4c725c5b9b8ed35a965fdd4a8b0a8278e0a (diff) | |
| download | mariadb-git-797a2d68f81bc931170d71d066d204c4071653b6.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am index 287b2cb1696..64ea0207017 100644 --- a/storage/federated/Makefile.am +++ b/storage/federated/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_federated.h EXTRA_LTLIBRARIES = ha_federated.la -pkglib_LTLIBRARIES = @plugin_federated_shared_target@ -ha_federated_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ +ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) ha_federated_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federated_la_SOURCES = ha_federated.cc |