diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-07-30 21:45:06 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-07-30 21:45:06 +0200 |
| commit | 813c25108afa34f1cae77619512913f32d5c8fb1 (patch) | |
| tree | 5f6b80946cde6491267528d12fd847be02056ebc /include/Makefile.am | |
| parent | 5d4a2573328ece1002759af88457798c3e638724 (diff) | |
| parent | 46d5ebb120f17e9e2ad1490d1e572a3b0cd145bf (diff) | |
| download | mariadb-git-813c25108afa34f1cae77619512913f32d5c8fb1.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
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 7 |
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 |