--- src/Makefile.am	2008-09-05 16:00:50.000000000 +0200
+++ src/Makefile.am.oden	2008-12-04 13:25:29.000000000 +0100
@@ -1,28 +1,36 @@
-QL_OPTIONS =                 -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT -D_P1003_1B_VISIBLE
-
-INCLUDES =                      $(ENG_MYSQL_INC)
-
-LIBS =
+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 \
+                        -I$(srcdir)
+#SUBDIRS =				../../include ../../mysys ../../strings ../../dbug ../../extra
+WRAPLIBS=
 
 LDADD =
 
-noinst_HEADERS =                ha_revision.h double_table_handler.h single_table_handler.h   
-
-lib_LTLIBRARIES =               librevision.la
-
-librevision_la_SOURCES =	ha_revision.cc double_table_handler.cc single_table_handler.cc
-
-librevision_la_LDFLAGS =    -module
-
-
-librevision_la_CXXFLAGS =   $(AM_CFLAGS) $(MYSQL_OPTIONS) -DMYSQL_DYNAMIC_PLUGIN -DMYSQL_SERVER
-librevision_la_CFLAGS =             $(AM_CFLAGS) $(MYSQL_OPTIONS) -DMYSQL_DYNAMIC_PLUGIN -DMYSQL_SERVER -std=c99
-
-EXTRA_LIBRARIES =               librevision.a
-noinst_LIBRARIES =              librevision.a
-librevision_a_SOURCES =             $(librevision_la_SOURCES)
-librevision_a_CXXFLAGS =    $(AM_CFLAGS) -DMYSQL_SERVER
-librevision_a_CFLAGS =              $(AM_CFLAGS) -DMYSQL_SERVER -std=c99
-
-EXTRA_DIST =                    CMakeLists.txt
+QL_OPTIONS = -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT -D_P1003_1B_VISIBLE
 
+DEFS= @DEFS@
+      
+noinst_HEADERS = ha_revision.h double_table_handler.h single_table_handler.h   
+
+EXTRA_LTLIBRARIES = ha_revision.la
+pkglib_LTLIBRARIES = @plugin_revision_shared_target@
+ha_revision_la_LDFLAGS = -module -rpath $(pkgplugindir)
+ha_revision_la_CXXFLAGS= $(AM_CFLAGS) $(MYSQL_OPTIONS) -DMYSQL_DYNAMIC_PLUGIN -DMYSQL_SERVER
+ha_revision_la_CFLAGS = $(AM_CFLAGS) $(MYSQL_OPTIONS) -DMYSQL_DYNAMIC_PLUGIN -DMYSQL_SERVER -std=c99
+ha_revision_la_SOURCES = ha_revision.cc double_table_handler.cc single_table_handler.cc
+
+EXTRA_LIBRARIES = librevision.a
+noinst_LIBRARIES = @plugin_revision_static_target@
+librevision_a_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_SERVER
+librevision_a_CFLAGS = $(AM_CFLAGS) -DMYSQL_SERVER -std=c99
+librevision_a_SOURCES = $(ha_revision_la_SOURCES)
+
+EXTRA_DIST =		CMakeLists.txt
+# Don't update the files from bitkeeper
+%::SCCS/s.%
--- plug.in	2008-09-08 21:36:44.000000000 +0200
+++ plug.in.oden	2008-12-04 14:01:51.000000000 +0100
@@ -1,4 +1,4 @@
 MYSQL_STORAGE_ENGINE(revision,,[Revision Storage Engine v 0.1-alpha],
         [Revision Storage Engine], [max,max-no-ndb])
-MYSQL_PLUGIN_STATIC(revision,    [src/librevision.a])
-MYSQL_PLUGIN_DYNAMIC(revision,   [src/ha_revision.la])
+MYSQL_PLUGIN_STATIC(revision,    [librevision.a])
+MYSQL_PLUGIN_DYNAMIC(revision,   [ha_revision.la])