From aeeac397e9a195fccd51103676a90fe565604f6f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 May 2007 14:16:21 +0200 Subject: [PATCH] Manual merge: Makefile lines must start with tab, not blank. --- client/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index d482512e411..2d8bd918734 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -109,13 +109,13 @@ link_sources: for f in $(sql_src) ; do \ rm -f $$f; \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ - done; \ - for f in $(strings_src) ; do \ - rm -f $(srcdir)/$$f; \ - @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ - done; \ - rm -f $(srcdir)/my_user.c; \ - @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; + done; \ + for f in $(strings_src) ; do \ + rm -f $(srcdir)/$$f; \ + @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ + done; \ + rm -f $(srcdir)/my_user.c; \ + @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; echo timestamp > link_sources; # Don't update the files from bitkeeper