summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2008-12-20 15:16:46 +0100
committerMikael Ronstrom <mikael@mysql.com>2008-12-20 15:16:46 +0100
commit4eaa41e29646742b2d591f64eb2971caa1610b9f (patch)
treee6e88b6a3cc633207a2fcfe176b4d231d3980867 /storage/myisammrg
parent0339019df6e551653fddf623f80dc1526ec97041 (diff)
downloadmariadb-git-4eaa41e29646742b2d591f64eb2971caa1610b9f.tar.gz
A number of fixes to DTrace patch
Removed instance manager from builds
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am
index 267ce71f8d1..2ae808c2011 100644
--- a/storage/myisammrg/Makefile.am
+++ b/storage/myisammrg/Makefile.am
@@ -41,7 +41,6 @@ libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G
-abs_top_srcdir = @abs_top_srcdir@
libmyisammrg_a_LIBADD = probes_mysql.o
libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
@@ -53,7 +52,7 @@ dtrace_files:
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
- $(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
+ $(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES) -o $@
endif
# Don't update the files from bitkeeper