diff options
| author | unknown <kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se> | 2006-10-21 01:13:50 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se> | 2006-10-21 01:13:50 +0200 |
| commit | 82ae9e46ad4d34b4e135151abae010e72b36ad46 (patch) | |
| tree | fd368ca61dff414da0d23234a99aab71785a8cbe /scripts | |
| parent | f00728f667c154a7091b55cc47035f714f6d98c4 (diff) | |
| parent | 7ac5d475bb054dae297dd5a81e82fb88ef6a4f46 (diff) | |
| download | mariadb-git-82ae9e46ad4d34b4e135151abae010e72b36ad46.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
configure.in:
Auto merged
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/make_win_bin_dist | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index cc75245e5d9..38e7ab88f22 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -144,8 +144,6 @@ fi # Copy data directory, readme files etc # ---------------------------------------------------------------------- -cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ - # FIXME is there ever a data directory to copy? if [ -d win/data ] ; then cp -pR win/data $DESTDIR/data @@ -159,9 +157,13 @@ mkdir $DESTDIR/Docs cp Docs/INSTALL-BINARY $DESTDIR/Docs/ cp Docs/manual.chm $DESTDIR/Docs/ || /bin/true cp ChangeLog $DESTDIR/Docs/ || /bin/true -cp COPYING $DESTDIR/Docs/ cp support-files/my-*.ini $DESTDIR/ +if [ -f COPYING ] ; then + cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ + cp COPYING $DESTDIR/Docs/ +fi + # ---------------------------------------------------------------------- # These will be filled in when we enable embedded. Note that if no # argument is given, it is copied if exists, else a check is done. @@ -170,7 +172,8 @@ cp support-files/my-*.ini $DESTDIR/ copy_embedded() { mkdir -p $DESTDIR/Embedded/DLL/release \ - $DESTDIR/Embedded/static/release + $DESTDIR/Embedded/static/release \ + $DESTDIR/include cp libmysqld/libmysqld.def $DESTDIR/include/ cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/ cp libmysqld/$TARGET/libmysqld.dll $DESTDIR/Embedded/DLL/release/ @@ -211,6 +214,9 @@ fi mkdir -p $DESTDIR/examples/tests cp tests/*.res tests/*.tst tests/*.pl tests/*.c $DESTDIR/examples/tests/ +mkdir -p $DESTDIR/examples/udf_example +cp sql/udf_example.def sql/udf_example.vcproj sql/udf_example.c $DESTDIR/examples/udf_example/ + # ---------------------------------------------------------------------- # FIXME why not copy it all in "include"?! # ---------------------------------------------------------------------- @@ -228,6 +234,7 @@ cp include/conf*.h \ include/m_string.h \ include/m_ctype.h \ include/my_global.h \ + include/raid.h \ include/typelib.h $DESTDIR/include/ cp libmysql/libmysql.def $DESTDIR/include/ |