Avoid clash with control container event handlers

[wxWidgets.git] / src / os2 / dllnames.sh

diff --git a/src/os2/dllnames.sh b/src/os2/dllnames.sh
index 2b3fcab16d3056bf13b9aee95ec9b3e5927c0de5..443b0da78ed11e114295da765dc753099f83b4df 100644 (file)
--- a/src/os2/dllnames.sh
+++ b/src/os2/dllnames.sh
@@ -6,12 +6,14 @@
 # a short(er) DLL name from it.
 
 dllFile="$1"
 # a short(er) DLL name from it.
 
 dllFile="$1"

+dirName=`echo $dllFile | sed 's-\(.*[/\\]\)[^/\\]*$-\1-'`
+dllFile=`echo $dllFile | sed 's-.*[/\\]\([^/\\]*\)$-\1-'`

 case $dllFile in
 *wx_base_*)
     dllFile=`echo $dllFile | sed 's/base_\(...\)/b\1/'`
     ;;
 *wx_based_*)
 case $dllFile in
 *wx_base_*)
     dllFile=`echo $dllFile | sed 's/base_\(...\)/b\1/'`
     ;;
 *wx_based_*)

-    dllFile=`echo $dllFile | sed 's/base_\(...\)/d\1/'`
+    dllFile=`echo $dllFile | sed 's/based_\(...\)/d\1/'`

     ;;
 *wx_based-*)
     dllFile=`echo $dllFile | sed 's/based/basd/'`
     ;;
 *wx_based-*)
     dllFile=`echo $dllFile | sed 's/based/basd/'`


@@ -26,5 +28,5 @@ case $dllFile in
     ;;
 esac
 dllFile="`echo $dllFile | sed 's/\.//' | sed 's/_//' | sed 's/-//'`"
     ;;
 esac
 dllFile="`echo $dllFile | sed 's/\.//' | sed 's/_//' | sed 's/-//'`"

-echo $dllFile
+echo $dirName$dllFile

 exit 0
\ No newline at end of file
 exit 0
\ No newline at end of file