summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2004-06-24 22:37:41 +0400
committerkonstantin@mysql.com <>2004-06-24 22:37:41 +0400
commit998fd5a8f0923003a3f3b0d2da564942fd5b3078 (patch)
tree1b1c5651fa1c88a0772f3deba300b50dfd890bbb /Makefile.am
parent88877e6710b51d6f4adebb2ed66910890c323951 (diff)
parenta32bb3c0c40d1a5c7ace1291664152ecd6c3622a (diff)
downloadmariadb-git-998fd5a8f0923003a3f3b0d2da564942fd5b3078.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 6d69ea85eb2..8f702a0e865 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,8 @@ linked_server_sources:
cd sql; rm -f mini_client_errors.c;\
@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c;\
rm -f pack.c;@LN_CP_F@ ../sql-common/pack.c pack.c;\
- rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c
+ rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c\
+ rm -f my_time.c;@LN_CP_F@ ../sql-common/my_time.c my_time.c
echo timestamp > linked_server_sources
# Create permission databases