diff options
| author | joerg@trift2. <> | 2008-03-27 12:45:16 +0100 |
|---|---|---|
| committer | joerg@trift2. <> | 2008-03-27 12:45:16 +0100 |
| commit | e7e5311ce459d3f31d64e4886d1e62d09f6f3363 (patch) | |
| tree | ad0f3904109b50a452c4e481659cd1eec465d3e9 /storage/archive | |
| parent | ac130084c4a1c533cc279dd446c5601071989354 (diff) | |
| parent | c7cd786ef8b29fcff9016f0650c7446da08be797 (diff) | |
| download | mariadb-git-e7e5311ce459d3f31d64e4886d1e62d09f6f3363.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-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 |