summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2007-07-30 21:40:13 +0200
committerunknown <kent@kent-amd64.(none)>2007-07-30 21:40:13 +0200
commit46d5ebb120f17e9e2ad1490d1e572a3b0cd145bf (patch)
tree15b6c01d4a96a8dfcc7c736fcbdf2d28fe1b8638 /include
parent06d4636bb68ce568f4d820d7961ca1eb78656673 (diff)
parent16ff419b8ae86ccbf017d19ee00141e3e1c05988 (diff)
downloadmariadb-git-46d5ebb120f17e9e2ad1490d1e572a3b0cd145bf.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/config_h/mysql-5.0-build
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 2cd72052a15..c856b6398fe 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -49,8 +49,11 @@ link_sources:
@readline_h_ln_cmd@
@yassl_h_ln_cmd@
-my_config.h: ../config.h
- $(CP) ../config.h my_config.h
+# We want both "my_config.h" and "config.h" that are identical, as
+# MySQL sources assumes the name "my_config.h", and 3rd party sources
+# assumes the name "config.h".
+my_config.h: config.h
+ $(CP) config.h my_config.h
# These files should not be included in distributions since they are
# generated by configure from the .h.in files