diff options
| author | unknown <kent@mysql.com> | 2006-06-17 15:42:24 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-06-17 15:42:24 +0200 |
| commit | 81202460bed74286deb0c4d262cb4a171a8c41f5 (patch) | |
| tree | 58fef7588d1b912d6a1a88c7630c0140b6668699 | |
| parent | 7775e0a1338cde6acb5cb0b748f686aa78bcc400 (diff) | |
| parent | 4d366600b87451881d64b027e6efe849adf29c42 (diff) | |
| download | mariadb-git-81202460bed74286deb0c4d262cb4a171a8c41f5.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
ndb/Makefile.am:
Auto merged
| -rwxr-xr-x | BUILD/compile-dist | 2 | ||||
| -rw-r--r-- | ndb/Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BUILD/compile-dist b/BUILD/compile-dist index 39095f59ffa..613f2643c56 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -6,7 +6,7 @@ # tree can then be picked up by "make dist" to create the "pristine source # package" that is used as the basis for all other binary builds. # -make distclean +test -f Makefile && make distclean aclocal autoheader libtoolize --automake --force --copy diff --git a/ndb/Makefile.am b/ndb/Makefile.am index 3aac54b38ee..ead70766e97 100644 --- a/ndb/Makefile.am +++ b/ndb/Makefile.am @@ -20,7 +20,8 @@ dist-hook: done windoze: - for i in `find . -name 'Makefile.am'`; do make -C `dirname $$i` windoze-dsp; done + for i in `find . -name 'old_dirs' -prune -o -name 'Makefile.am' -print`; \ + do make -C `dirname $$i` windoze-dsp; done windoze-dsp: |