diff options
| author | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2008-03-06 13:53:35 +0000 |
|---|---|---|
| committer | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2008-03-06 13:53:35 +0000 |
| commit | 14ab7bccaa26eb1f9520056f1452f79fdde076d5 (patch) | |
| tree | f9524fad668858b797f45d000148a04ffda047df /storage/archive | |
| parent | ed2ab9338e9c0c3aed387e3264ea40b7e792c559 (diff) | |
| parent | db4aee18bdb1e48f8416f00c61f94e86a62f0b71 (diff) | |
| download | mariadb-git-14ab7bccaa26eb1f9520056f1452f79fdde076d5.tar.gz | |
Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/bug-31736/5.1
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am index 4920527e0e9..d092f091798 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/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 \ @@ -33,8 +34,8 @@ noinst_HEADERS = ha_archive.h azlib.h noinst_PROGRAMS = archive_test archive_reader EXTRA_LTLIBRARIES = ha_archive.la -pkglib_LTLIBRARIES = @plugin_archive_shared_target@ -ha_archive_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ +ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_SOURCES = ha_archive.cc azio.c |