summaryrefslogtreecommitdiff
path: root/include/Makefile.am
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2007-07-30 21:45:06 +0200
committerkent@kent-amd64.(none) <>2007-07-30 21:45:06 +0200
commitfd3b865149faced7ef5ff1696109df576f44d508 (patch)
tree5f6b80946cde6491267528d12fd847be02056ebc /include/Makefile.am
parentce5044072e851b5af9e25995ed260a2cdbc316ed (diff)
parent01ad4893562aff4bad9ce94285942e8405034ebb (diff)
downloadmariadb-git-fd3b865149faced7ef5ff1696109df576f44d508.tar.gz
Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
into mysql.com:/home/kent/bk/config_h/mysql-5.1-build
Diffstat (limited to 'include/Makefile.am')
-rw-r--r--include/Makefile.am7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 0796341cc91..fe54a7e35e0 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -53,8 +53,11 @@ link_sources:
@yassl_h_ln_cmd@
echo timestamp > link_sources
-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