summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-02-06 14:35:00 +0100
committerMikael Ronstrom <mikael@mysql.com>2009-02-06 14:35:00 +0100
commitcc6c28686ec55379060f91bf8766f0eb69467eec (patch)
tree72541dcb068852cd469de60e4f8f40f2073280f2
parent9bfa4fe48d196f15ae81f29e9f50aec149b580ac (diff)
downloadmariadb-git-cc6c28686ec55379060f91bf8766f0eb69467eec.tar.gz
Reverted DTrace fix
-rw-r--r--mysys/Makefile.am2
-rw-r--r--sql/Makefile.am2
-rw-r--r--storage/archive/Makefile.am2
-rw-r--r--storage/blackhole/Makefile.am2
-rw-r--r--storage/csv/Makefile.am2
-rw-r--r--storage/example/Makefile.am2
-rw-r--r--storage/federated/Makefile.am2
-rw-r--r--storage/heap/Makefile.am2
-rw-r--r--storage/myisam/Makefile.am2
-rw-r--r--storage/myisammrg/Makefile.am2
10 files changed, 10 insertions, 10 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 0329d137c24..045c80f32e4 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -131,7 +131,7 @@ libmysys_a_LIBADD += probes_mysql.o
libmysys_a_DEPENDENCIES += probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = mf_keycache.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/sql/Makefile.am b/sql/Makefile.am
index d7c35b3eb9a..d05e0efbcba 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -212,7 +212,7 @@ libndb_la_DEPENDENCIES = dtrace_files dtrace_providers probes_libndb.o
mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES += dtrace_files dtrace_providers probes_all.o
CLEANFILES += dtrace_files dtrace_providers probes_all.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index 621037936fa..649d84d8152 100644
--- a/storage/archive/Makefile.am
+++ b/storage/archive/Makefile.am
@@ -72,7 +72,7 @@ libarchive_a_LIBADD = probes_mysql.o
libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libarchive_a-ha_archive.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am
index 63e3d8dd208..c274ce8f908 100644
--- a/storage/blackhole/Makefile.am
+++ b/storage/blackhole/Makefile.am
@@ -54,7 +54,7 @@ libblackhole_a_LIBADD = probes_mysql.o
libblackhole_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libblackhole_a-ha_blackhole.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am
index 52707ff6eb8..fa7f77bd746 100644
--- a/storage/csv/Makefile.am
+++ b/storage/csv/Makefile.am
@@ -47,7 +47,7 @@ libcsv_a_LIBADD = probes_mysql.o
libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libcsv_a-ha_tina.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am
index a01230be219..bcf519c67c6 100644
--- a/storage/example/Makefile.am
+++ b/storage/example/Makefile.am
@@ -55,7 +55,7 @@ libexample_a_DEPENDENCIES = probes_mysql.o
CLEANFILES =
BUILT_SOURCES =
DTRACEFILES = libexample_a-ha_example.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am
index 3f05b77e092..25db59dc3ce 100644
--- a/storage/federated/Makefile.am
+++ b/storage/federated/Makefile.am
@@ -54,7 +54,7 @@ libfederated_a_LIBADD = probes_mysql.o
libfederated_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libfederated_a-ha_federated.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am
index e7250a9bc45..5528fec71f1 100644
--- a/storage/heap/Makefile.am
+++ b/storage/heap/Makefile.am
@@ -56,7 +56,7 @@ libheap_a_LIBADD = probes_mysql.o
libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_heap.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am
index 8009f56fbf9..797d7523301 100644
--- a/storage/myisam/Makefile.am
+++ b/storage/myisam/Makefile.am
@@ -155,7 +155,7 @@ libmyisam_a_LIBADD = probes_mysql.o
libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES += probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisam.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
diff --git a/storage/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am
index 7a95bd7dab0..2ae808c2011 100644
--- a/storage/myisammrg/Makefile.am
+++ b/storage/myisammrg/Makefile.am
@@ -45,7 +45,7 @@ libmyisammrg_a_LIBADD = probes_mysql.o
libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisammrg.o
-DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@