From 8ab3b72ba8c7c6a76e67a89ea9068bae58f01682 Mon Sep 17 00:00:00 2001
From: unknown <kent/mysqldev@suse9-x86.mysql.com>
Date: Sat, 2 Dec 2006 04:25:41 +0100
Subject: [PATCH] myisampack.def, myisamlog.def, myisam_ftdump.def,
 myisamchk.def:   Adjusted for storage path nwbootstrap:   Corrected bad merge

netware/BUILD/nwbootstrap:
  Corrected bad merge
netware/myisam_ftdump.def:
  Adjusted for storage path
netware/myisamchk.def:
  Adjusted for storage path
netware/myisamlog.def:
  Adjusted for storage path
netware/myisampack.def:
  Adjusted for storage path
---
 netware/BUILD/nwbootstrap | 3 +--
 netware/myisam_ftdump.def | 2 +-
 netware/myisamchk.def     | 2 +-
 netware/myisamlog.def     | 2 +-
 netware/myisampack.def    | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/netware/BUILD/nwbootstrap b/netware/BUILD/nwbootstrap
index 2f291cde9f2..590231cc3f6 100755
--- a/netware/BUILD/nwbootstrap
+++ b/netware/BUILD/nwbootstrap
@@ -172,8 +172,7 @@ nlm_version=`echo "$version" | sed -e "s;\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*;\1
 for file in ./netware/*.def
 do
   mv -f $file $file.org
-  sed -e "s;VERSION.*;VERSION $nlm_version;g" \
-      -e "s;XDCDATA.*;XDCDATA $SRC_DIR/netware/mysql.xdc;g" $file.org > $file
+  sed -e "s;VERSION.*;VERSION $nlm_version;g" $file.org > $file
   rm $file.org
 done
 
diff --git a/netware/myisam_ftdump.def b/netware/myisam_ftdump.def
index 78123537a54..f2b4890a54d 100644
--- a/netware/myisam_ftdump.def
+++ b/netware/myisam_ftdump.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
 DESCRIPTION "MySQL MyISAM Table Dump Tool"
 VERSION 4, 0
 STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
+XDCDATA ../../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisamchk.def b/netware/myisamchk.def
index 9805eb4ec1b..71fb66d0ed1 100644
--- a/netware/myisamchk.def
+++ b/netware/myisamchk.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
 DESCRIPTION "MySQL MyISAM Table Check Tool"
 VERSION 4, 0
 STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
+XDCDATA ../../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisamlog.def b/netware/myisamlog.def
index 925650eac7b..1924ba2192b 100644
--- a/netware/myisamlog.def
+++ b/netware/myisamlog.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
 DESCRIPTION "MySQL MyISAM Table Log Tool"
 VERSION 4, 0
 STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
+XDCDATA ../../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisampack.def b/netware/myisampack.def
index 877a143fd2e..39fd1b34100 100644
--- a/netware/myisampack.def
+++ b/netware/myisampack.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
 DESCRIPTION "MySQL MyISAM Table Pack Tool"
 VERSION 4, 0
 STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
+XDCDATA ../../netware/mysql.xdc
 #DEBUG