← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to scripts/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-01 20:52:03 UTC
  • mfrom: (28.1.23 libtool-patch)
  • Revision ID: brian@tangent.org-20080701205203-3jm6ga57uzxy8k4t
Merge of taylor's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/Makefile.am
107
107
# Build mysql_fix_privilege_tables.sql from the files that contain
108
108
# the system tables for this version of MySQL plus any commands
109
109
# needed to upgrade the system tables from an older version
110
 
mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
111
 
                                mysql_system_tables_fix.sql
 
110
mysql_fix_privilege_tables.sql: $(srcdir)/mysql_system_tables.sql \
 
111
                                $(srcdir)/mysql_system_tables_fix.sql
112
112
        @echo "Building $@";
113
 
        @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@
 
113
        @cat $(srcdir)/mysql_system_tables.sql $(srcdir)/mysql_system_tables_fix.sql > $@
114
114
 
115
115
#
116
116
# Build mysql_fix_privilege_tables_sql.c from
118
118
# The "sleep" ensures the generated file has a younger timestamp than its source
119
119
# (which may have been generated in this very same "make" run).
120
120
#
121
 
mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
122
 
        $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
123
 
        sleep 2
124
 
        $(top_builddir)/scripts/comp_sql$(EXEEXT) \
 
121
mysql_fix_privilege_tables_sql.c: $(builddir)/comp_sql$(EXEEXT) mysql_fix_privilege_tables.sql
 
122
        $(builddir)/comp_sql$(EXEEXT) \
125
123
          mysql_fix_privilege_tables \
126
 
            $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
 
124
            $(builddir)/mysql_fix_privilege_tables.sql $@
127
125
 
128
126
 
129
127
SUFFIXES = .sh
192
190
        @CHMOD@ +x $@-t
193
191
        @MV@ $@-t $@
194
192
 
195
 
 
196
 
# Don't update the files from bitkeeper
197
 
%::SCCS/s.%