Commit e82f018a authored by Jonathan Perkin's avatar Jonathan Perkin

Only install the innodb plugin if the plugin directory exists.

parent 98ca539c
...@@ -287,8 +287,10 @@ cp libmysql/$TARGET/libmysql.dll \ ...@@ -287,8 +287,10 @@ cp libmysql/$TARGET/libmysql.dll \
regex/$TARGET/regex.lib \ regex/$TARGET/regex.lib \
strings/$TARGET/strings.lib \ strings/$TARGET/strings.lib \
zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/ zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.dll \ if [ -d storage/innodb_plugin ]; then
cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.dll \
$DESTDIR/lib/plugin/ $DESTDIR/lib/plugin/
fi
if [ x"$TARGET" != x"release" ] ; then if [ x"$TARGET" != x"release" ] ; then
cp libmysql/$TARGET/libmysql.pdb \ cp libmysql/$TARGET/libmysql.pdb \
...@@ -297,8 +299,10 @@ if [ x"$TARGET" != x"release" ] ; then ...@@ -297,8 +299,10 @@ if [ x"$TARGET" != x"release" ] ; then
regex/$TARGET/regex.pdb \ regex/$TARGET/regex.pdb \
strings/$TARGET/strings.pdb \ strings/$TARGET/strings.pdb \
zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/ zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/
if [ -d storage/innodb_plugin ]; then
cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.pdb \ cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.pdb \
$DESTDIR/lib/plugin/ $DESTDIR/lib/plugin/
fi
fi fi
...@@ -319,10 +323,12 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \ ...@@ -319,10 +323,12 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
strings/debug/strings.pdb \ strings/debug/strings.pdb \
zlib/debug/zlib.lib \ zlib/debug/zlib.lib \
zlib/debug/zlib.pdb $DESTDIR/lib/debug/ zlib/debug/zlib.pdb $DESTDIR/lib/debug/
if [ -d storage/innodb_plugin ]; then
cp storage/innodb_plugin/debug/ha_innodb_plugin.dll \ cp storage/innodb_plugin/debug/ha_innodb_plugin.dll \
storage/innodb_plugin/debug/ha_innodb_plugin.lib \ storage/innodb_plugin/debug/ha_innodb_plugin.lib \
storage/innodb_plugin/debug/ha_innodb_plugin.pdb \ storage/innodb_plugin/debug/ha_innodb_plugin.pdb \
$DESTDIR/lib/plugin/debug/ $DESTDIR/lib/plugin/debug/
fi
fi fi
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment