summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2004-06-24 22:37:41 +0400
committerunknown <konstantin@mysql.com>2004-06-24 22:37:41 +0400
commit9db3251611994e3c3410c19e99ef70051436b4c8 (patch)
tree1b1c5651fa1c88a0772f3deba300b50dfd890bbb /Makefile.am
parent292116f50fbf32329d737fd34fce1fd9aba2b0a1 (diff)
parent717be2d9c7274edb5a23c5863fa4f19d255d2baa (diff)
downloadmariadb-git-9db3251611994e3c3410c19e99ef70051436b4c8.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