OS/2 hadn't been updated to cope with the ext/ restructuring.

I don't have OS/2, so I can't test this, but the code in Configure will assume
flat directories, because ext/File-Glob is present, and hence not search
recursively and not find the OS/2 extensions if they are copied into ext/OS2/*

I believe that without this change OS/2 will not have been building since the
change to flattened ext. This change may not be sufficient to get OS/2
building again, but it is in the right direction.

46 files changed, 2 insertions, 6 deletions

diff --git a/hints/os2.sh b/hints/os2.sh
index 8c8ef21bb2..6309b198fc 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -456,11 +456,7 @@ fi
 
 cd ./os2/OS2
 
-if ! test -d ../../ext/OS2 ; then
-   mkdir ../../ext/OS2
-fi
-
-cp -rfu * ../../ext/OS2/
+cp -rfu * ../../ext/
 
 # Install tests:
 
diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index f7ee823f6d..6ef04e57d8 100644
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -481,7 +481,7 @@ $d/%/Makefile.aout : miniperl_ \$(_preplibrary) \$(AOUT_EXTENSIONS_FORCE)
 done
 
 # We need to special-case OS2/DLL/DLL.a, since the recipe above will
-# try to find it in ext/OS2/DLL
+# try to find it in ext/OS2-DLL
 
 $spitshell >>Makefile <<'!NO!SUBS!'
 lib/auto/OS2/DLL/DLL.a : lib/auto/OS2/REXX/REXX.a
diff --git a/os2/OS2/ExtAttr/Changes b/os2/OS2/OS2-ExtAttr/Changes
index 92b51826cc..92b51826cc 100644
--- a/os2/OS2/ExtAttr/Changes
+++ b/os2/OS2/OS2-ExtAttr/Changes
diff --git a/os2/OS2/ExtAttr/ExtAttr.pm b/os2/OS2/OS2-ExtAttr/ExtAttr.pm
index c49f1d4de5..c49f1d4de5 100644
--- a/os2/OS2/ExtAttr/ExtAttr.pm
+++ b/os2/OS2/OS2-ExtAttr/ExtAttr.pm
diff --git a/os2/OS2/ExtAttr/ExtAttr.xs b/os2/OS2/OS2-ExtAttr/ExtAttr.xs
index 1f4e203cec..1f4e203cec 100644
--- a/os2/OS2/ExtAttr/ExtAttr.xs
+++ b/os2/OS2/OS2-ExtAttr/ExtAttr.xs
diff --git a/os2/OS2/ExtAttr/MANIFEST b/os2/OS2/OS2-ExtAttr/MANIFEST
index b1a8e80e77..b1a8e80e77 100644
--- a/os2/OS2/ExtAttr/MANIFEST
+++ b/os2/OS2/OS2-ExtAttr/MANIFEST
diff --git a/os2/OS2/ExtAttr/Makefile.PL b/os2/OS2/OS2-ExtAttr/Makefile.PL
index 0b8837f153..0b8837f153 100644
--- a/os2/OS2/ExtAttr/Makefile.PL
+++ b/os2/OS2/OS2-ExtAttr/Makefile.PL
diff --git a/os2/OS2/ExtAttr/myea.h b/os2/OS2/OS2-ExtAttr/myea.h
index ec4dc81f99..ec4dc81f99 100644
--- a/os2/OS2/ExtAttr/myea.h
+++ b/os2/OS2/OS2-ExtAttr/myea.h
diff --git a/os2/OS2/ExtAttr/t/os2_ea.t b/os2/OS2/OS2-ExtAttr/t/os2_ea.t
index 947e2f1916..947e2f1916 100644
--- a/os2/OS2/ExtAttr/t/os2_ea.t
+++ b/os2/OS2/OS2-ExtAttr/t/os2_ea.t
diff --git a/os2/OS2/ExtAttr/typemap b/os2/OS2/OS2-ExtAttr/typemap
index c2f5cda2ed..c2f5cda2ed 100644
--- a/os2/OS2/ExtAttr/typemap
+++ b/os2/OS2/OS2-ExtAttr/typemap
diff --git a/os2/OS2/PrfDB/Changes b/os2/OS2/OS2-PrfDB/Changes
index 49ac8c1a43..49ac8c1a43 100644
--- a/os2/OS2/PrfDB/Changes
+++ b/os2/OS2/OS2-PrfDB/Changes
diff --git a/os2/OS2/PrfDB/MANIFEST b/os2/OS2/OS2-PrfDB/MANIFEST
index fb96b03c5d..fb96b03c5d 100644
--- a/os2/OS2/PrfDB/MANIFEST
+++ b/os2/OS2/OS2-PrfDB/MANIFEST
diff --git a/os2/OS2/PrfDB/Makefile.PL b/os2/OS2/OS2-PrfDB/Makefile.PL
index 2d4a6a7ae5..2d4a6a7ae5 100644
--- a/os2/OS2/PrfDB/Makefile.PL
+++ b/os2/OS2/OS2-PrfDB/Makefile.PL
diff --git a/os2/OS2/PrfDB/PrfDB.pm b/os2/OS2/OS2-PrfDB/PrfDB.pm
index a1bdc33a1c..a1bdc33a1c 100644
--- a/os2/OS2/PrfDB/PrfDB.pm
+++ b/os2/OS2/OS2-PrfDB/PrfDB.pm
diff --git a/os2/OS2/PrfDB/PrfDB.xs b/os2/OS2/OS2-PrfDB/PrfDB.xs
index bc4661a5d6..bc4661a5d6 100644
--- a/os2/OS2/PrfDB/PrfDB.xs
+++ b/os2/OS2/OS2-PrfDB/PrfDB.xs
diff --git a/os2/OS2/PrfDB/t/os2_prfdb.t b/os2/OS2/OS2-PrfDB/t/os2_prfdb.t
index b9f7d90ae2..b9f7d90ae2 100644
--- a/os2/OS2/PrfDB/t/os2_prfdb.t
+++ b/os2/OS2/OS2-PrfDB/t/os2_prfdb.t
diff --git a/os2/OS2/Process/MANIFEST b/os2/OS2/OS2-Process/MANIFEST
index 125e55fd50..125e55fd50 100644
--- a/os2/OS2/Process/MANIFEST
+++ b/os2/OS2/OS2-Process/MANIFEST
diff --git a/os2/OS2/Process/Makefile.PL b/os2/OS2/OS2-Process/Makefile.PL
index c24af0c1ed..c24af0c1ed 100644
--- a/os2/OS2/Process/Makefile.PL
+++ b/os2/OS2/OS2-Process/Makefile.PL
diff --git a/os2/OS2/Process/Process.pm b/os2/OS2/OS2-Process/Process.pm
index 70583617b1..70583617b1 100644
--- a/os2/OS2/Process/Process.pm
+++ b/os2/OS2/OS2-Process/Process.pm
diff --git a/os2/OS2/Process/Process.xs b/os2/OS2/OS2-Process/Process.xs
index 05befa02cc..05befa02cc 100644
--- a/os2/OS2/Process/Process.xs
+++ b/os2/OS2/OS2-Process/Process.xs
diff --git a/os2/OS2/Process/t/os2_atoms.t b/os2/OS2/OS2-Process/t/os2_atoms.t
index 5d9603f2c9..5d9603f2c9 100644
--- a/os2/OS2/Process/t/os2_atoms.t
+++ b/os2/OS2/OS2-Process/t/os2_atoms.t
diff --git a/os2/OS2/Process/t/os2_clipboard.t b/os2/OS2/OS2-Process/t/os2_clipboard.t
index 398a5fee7d..398a5fee7d 100644
--- a/os2/OS2/Process/t/os2_clipboard.t
+++ b/os2/OS2/OS2-Process/t/os2_clipboard.t
diff --git a/os2/OS2/Process/t/os2_process.t b/os2/OS2/OS2-Process/t/os2_process.t
index 18d8fe2a11..18d8fe2a11 100644
--- a/os2/OS2/Process/t/os2_process.t
+++ b/os2/OS2/OS2-Process/t/os2_process.t
diff --git a/os2/OS2/Process/t/os2_process_kid.t b/os2/OS2/OS2-Process/t/os2_process_kid.t
index 7551d41bda..7551d41bda 100644
--- a/os2/OS2/Process/t/os2_process_kid.t
+++ b/os2/OS2/OS2-Process/t/os2_process_kid.t
diff --git a/os2/OS2/Process/t/os2_process_text.t b/os2/OS2/OS2-Process/t/os2_process_text.t
index 7367327ca4..7367327ca4 100644
--- a/os2/OS2/Process/t/os2_process_text.t
+++ b/os2/OS2/OS2-Process/t/os2_process_text.t
diff --git a/os2/OS2/REXX/Changes b/os2/OS2/OS2-REXX/Changes
index 7c19710db6..7c19710db6 100644
--- a/os2/OS2/REXX/Changes
+++ b/os2/OS2/OS2-REXX/Changes
diff --git a/os2/OS2/REXX/DLL/Changes b/os2/OS2/OS2-REXX/DLL/Changes
index 07c41da30a..07c41da30a 100644
--- a/os2/OS2/REXX/DLL/Changes
+++ b/os2/OS2/OS2-REXX/DLL/Changes
diff --git a/os2/OS2/REXX/DLL/DLL.pm b/os2/OS2/OS2-REXX/DLL/DLL.pm
index 2a2486e863..2a2486e863 100644
--- a/os2/OS2/REXX/DLL/DLL.pm
+++ b/os2/OS2/OS2-REXX/DLL/DLL.pm
diff --git a/os2/OS2/REXX/DLL/DLL.xs b/os2/OS2/OS2-REXX/DLL/DLL.xs
index 90b14eaf85..90b14eaf85 100644
--- a/os2/OS2/REXX/DLL/DLL.xs
+++ b/os2/OS2/OS2-REXX/DLL/DLL.xs
diff --git a/os2/OS2/REXX/DLL/MANIFEST b/os2/OS2/OS2-REXX/DLL/MANIFEST
index d7ad9b6338..d7ad9b6338 100644
--- a/os2/OS2/REXX/DLL/MANIFEST
+++ b/os2/OS2/OS2-REXX/DLL/MANIFEST
diff --git a/os2/OS2/REXX/DLL/Makefile.PL b/os2/OS2/OS2-REXX/DLL/Makefile.PL
index 6756402c2f..6756402c2f 100644
--- a/os2/OS2/REXX/DLL/Makefile.PL
+++ b/os2/OS2/OS2-REXX/DLL/Makefile.PL
diff --git a/os2/OS2/REXX/MANIFEST b/os2/OS2/OS2-REXX/MANIFEST
index 4ac81492e4..4ac81492e4 100644
--- a/os2/OS2/REXX/MANIFEST
+++ b/os2/OS2/OS2-REXX/MANIFEST
diff --git a/os2/OS2/REXX/Makefile.PL b/os2/OS2/OS2-REXX/Makefile.PL
index 9b4c0baf25..9b4c0baf25 100644
--- a/os2/OS2/REXX/Makefile.PL
+++ b/os2/OS2/OS2-REXX/Makefile.PL
diff --git a/os2/OS2/REXX/REXX.pm b/os2/OS2/OS2-REXX/REXX.pm
index ca9fee69ce..ca9fee69ce 100644
--- a/os2/OS2/REXX/REXX.pm
+++ b/os2/OS2/OS2-REXX/REXX.pm
diff --git a/os2/OS2/REXX/REXX.xs b/os2/OS2/OS2-REXX/REXX.xs
index 428dfd57f5..428dfd57f5 100644
--- a/os2/OS2/REXX/REXX.xs
+++ b/os2/OS2/OS2-REXX/REXX.xs
diff --git a/os2/OS2/REXX/t/rx_cmprt.t b/os2/OS2/OS2-REXX/t/rx_cmprt.t
index 6db785be51..6db785be51 100644
--- a/os2/OS2/REXX/t/rx_cmprt.t
+++ b/os2/OS2/OS2-REXX/t/rx_cmprt.t
diff --git a/os2/OS2/REXX/t/rx_dllld.t b/os2/OS2/OS2-REXX/t/rx_dllld.t
index 406bd63a33..406bd63a33 100644
--- a/os2/OS2/REXX/t/rx_dllld.t
+++ b/os2/OS2/OS2-REXX/t/rx_dllld.t
diff --git a/os2/OS2/REXX/t/rx_emxrv.t b/os2/OS2/OS2-REXX/t/rx_emxrv.t
index 5df8c32785..5df8c32785 100644
--- a/os2/OS2/REXX/t/rx_emxrv.t
+++ b/os2/OS2/OS2-REXX/t/rx_emxrv.t
diff --git a/os2/OS2/REXX/t/rx_objcall.t b/os2/OS2/OS2-REXX/t/rx_objcall.t
index 0ec67b112d..0ec67b112d 100644
--- a/os2/OS2/REXX/t/rx_objcall.t
+++ b/os2/OS2/OS2-REXX/t/rx_objcall.t
diff --git a/os2/OS2/REXX/t/rx_sql.test b/os2/OS2/OS2-REXX/t/rx_sql.test
index 602c76dc47..602c76dc47 100644
--- a/os2/OS2/REXX/t/rx_sql.test
+++ b/os2/OS2/OS2-REXX/t/rx_sql.test
diff --git a/os2/OS2/REXX/t/rx_tiesql.test b/os2/OS2/OS2-REXX/t/rx_tiesql.test
index c85a1e990b..c85a1e990b 100644
--- a/os2/OS2/REXX/t/rx_tiesql.test
+++ b/os2/OS2/OS2-REXX/t/rx_tiesql.test
diff --git a/os2/OS2/REXX/t/rx_tievar.t b/os2/OS2/OS2-REXX/t/rx_tievar.t
index 9c9ea7d466..9c9ea7d466 100644
--- a/os2/OS2/REXX/t/rx_tievar.t
+++ b/os2/OS2/OS2-REXX/t/rx_tievar.t
diff --git a/os2/OS2/REXX/t/rx_tieydb.t b/os2/OS2/OS2-REXX/t/rx_tieydb.t
index ec6bfca20e..ec6bfca20e 100644
--- a/os2/OS2/REXX/t/rx_tieydb.t
+++ b/os2/OS2/OS2-REXX/t/rx_tieydb.t
diff --git a/os2/OS2/REXX/t/rx_varset.t b/os2/OS2/OS2-REXX/t/rx_varset.t
index 166cf53623..166cf53623 100644
--- a/os2/OS2/REXX/t/rx_varset.t
+++ b/os2/OS2/OS2-REXX/t/rx_varset.t
diff --git a/os2/OS2/REXX/t/rx_vrexx.t b/os2/OS2/OS2-REXX/t/rx_vrexx.t
index 3611894682..3611894682 100644
--- a/os2/OS2/REXX/t/rx_vrexx.t
+++ b/os2/OS2/OS2-REXX/t/rx_vrexx.t
diff --git a/os2/OS2/typemap b/os2/OS2/OS2-typemap
index 12bd58d347..12bd58d347 100644
--- a/os2/OS2/typemap
+++ b/os2/OS2/OS2-typemap