Changed to use top_srcdir instead of abs_top_srcdir since many

automake tools on Solaris seems to have a bug related to the
use of abs_top_srcdir

11 files changed, 12 insertions, 12 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index a083482e32a..22305ba57c3 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -69,7 +69,7 @@ my_config.h: config.h
 dist-hook:
 	$(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h
 
-DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 if HAVE_DTRACE
 BUILT_SOURCES += probes_mysql_dtrace.h
 CLEANFILES += probes_mysql_dtrace.h
@@ -79,7 +79,7 @@ probes_mysql_dtrace.h: $(DTRACEPROVIDER)
 endif
 
 probes_mysql_nodtrace.h: $(DTRACEPROVIDER)
-	$(abs_top_srcdir)/scripts/dheadgen.pl -f $(DTRACEPROVIDER) > $@
+	$(top_srcdir)/scripts/dheadgen.pl -f $(DTRACEPROVIDER) > $@
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 5c1cf07ce94..7e9b53f2015 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/sql/Makefile.am b/sql/Makefile.am
index d05e0efbcba..d7c35b3eb9a 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index d9ff3ab1ec4..b86611d24e6 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am
index fe7da5deed0..855fd30cb8d 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am
index 39c6b83495c..0f19c1159bc 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am
index a511511fa2e..37bc3784ff6 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am
index 395f4225fe4..3c2941263fe 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am
index 4aeffe5a5d8..d8bb1da3ecd 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am
index 37b0749b7f2..76d98fbd97b 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
diff --git a/storage/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am
index 9190e37f8cd..b86b0aecff0 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 = $(abs_top_srcdir)/sql/probes_mysql.d
+DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@