From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 4 Sep 2009 10:04:30 +0000 (+0100)
Subject: OS/2 hadn't been updated to cope with the ext/ restructuring.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=354c724e;p=p5sagit%2Fp5-mst-13.2.git

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.
---

diff --git a/hints/os2.sh b/hints/os2.sh
index 8c8ef21..6309b19 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 f7ee823..6ef04e5 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
similarity index 100%
rename from os2/OS2/ExtAttr/Changes
rename to os2/OS2/OS2-ExtAttr/Changes
diff --git a/os2/OS2/ExtAttr/ExtAttr.pm b/os2/OS2/OS2-ExtAttr/ExtAttr.pm
similarity index 100%
rename from os2/OS2/ExtAttr/ExtAttr.pm
rename to os2/OS2/OS2-ExtAttr/ExtAttr.pm
diff --git a/os2/OS2/ExtAttr/ExtAttr.xs b/os2/OS2/OS2-ExtAttr/ExtAttr.xs
similarity index 100%
rename from os2/OS2/ExtAttr/ExtAttr.xs
rename to os2/OS2/OS2-ExtAttr/ExtAttr.xs
diff --git a/os2/OS2/ExtAttr/MANIFEST b/os2/OS2/OS2-ExtAttr/MANIFEST
similarity index 100%
rename from os2/OS2/ExtAttr/MANIFEST
rename to os2/OS2/OS2-ExtAttr/MANIFEST
diff --git a/os2/OS2/ExtAttr/Makefile.PL b/os2/OS2/OS2-ExtAttr/Makefile.PL
similarity index 100%
rename from os2/OS2/ExtAttr/Makefile.PL
rename to os2/OS2/OS2-ExtAttr/Makefile.PL
diff --git a/os2/OS2/ExtAttr/myea.h b/os2/OS2/OS2-ExtAttr/myea.h
similarity index 100%
rename from os2/OS2/ExtAttr/myea.h
rename to 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
similarity index 100%
rename from os2/OS2/ExtAttr/t/os2_ea.t
rename to os2/OS2/OS2-ExtAttr/t/os2_ea.t
diff --git a/os2/OS2/ExtAttr/typemap b/os2/OS2/OS2-ExtAttr/typemap
similarity index 100%
rename from os2/OS2/ExtAttr/typemap
rename to os2/OS2/OS2-ExtAttr/typemap
diff --git a/os2/OS2/PrfDB/Changes b/os2/OS2/OS2-PrfDB/Changes
similarity index 100%
rename from os2/OS2/PrfDB/Changes
rename to os2/OS2/OS2-PrfDB/Changes
diff --git a/os2/OS2/PrfDB/MANIFEST b/os2/OS2/OS2-PrfDB/MANIFEST
similarity index 100%
rename from os2/OS2/PrfDB/MANIFEST
rename to os2/OS2/OS2-PrfDB/MANIFEST
diff --git a/os2/OS2/PrfDB/Makefile.PL b/os2/OS2/OS2-PrfDB/Makefile.PL
similarity index 100%
rename from os2/OS2/PrfDB/Makefile.PL
rename to os2/OS2/OS2-PrfDB/Makefile.PL
diff --git a/os2/OS2/PrfDB/PrfDB.pm b/os2/OS2/OS2-PrfDB/PrfDB.pm
similarity index 100%
rename from os2/OS2/PrfDB/PrfDB.pm
rename to os2/OS2/OS2-PrfDB/PrfDB.pm
diff --git a/os2/OS2/PrfDB/PrfDB.xs b/os2/OS2/OS2-PrfDB/PrfDB.xs
similarity index 100%
rename from os2/OS2/PrfDB/PrfDB.xs
rename to 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
similarity index 100%
rename from os2/OS2/PrfDB/t/os2_prfdb.t
rename to os2/OS2/OS2-PrfDB/t/os2_prfdb.t
diff --git a/os2/OS2/Process/MANIFEST b/os2/OS2/OS2-Process/MANIFEST
similarity index 100%
rename from os2/OS2/Process/MANIFEST
rename to os2/OS2/OS2-Process/MANIFEST
diff --git a/os2/OS2/Process/Makefile.PL b/os2/OS2/OS2-Process/Makefile.PL
similarity index 100%
rename from os2/OS2/Process/Makefile.PL
rename to os2/OS2/OS2-Process/Makefile.PL
diff --git a/os2/OS2/Process/Process.pm b/os2/OS2/OS2-Process/Process.pm
similarity index 100%
rename from os2/OS2/Process/Process.pm
rename to os2/OS2/OS2-Process/Process.pm
diff --git a/os2/OS2/Process/Process.xs b/os2/OS2/OS2-Process/Process.xs
similarity index 100%
rename from os2/OS2/Process/Process.xs
rename to 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
similarity index 100%
rename from os2/OS2/Process/t/os2_atoms.t
rename to 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
similarity index 100%
rename from os2/OS2/Process/t/os2_clipboard.t
rename to 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
similarity index 100%
rename from os2/OS2/Process/t/os2_process.t
rename to 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
similarity index 100%
rename from os2/OS2/Process/t/os2_process_kid.t
rename to 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
similarity index 100%
rename from os2/OS2/Process/t/os2_process_text.t
rename to os2/OS2/OS2-Process/t/os2_process_text.t
diff --git a/os2/OS2/REXX/Changes b/os2/OS2/OS2-REXX/Changes
similarity index 100%
rename from os2/OS2/REXX/Changes
rename to os2/OS2/OS2-REXX/Changes
diff --git a/os2/OS2/REXX/DLL/Changes b/os2/OS2/OS2-REXX/DLL/Changes
similarity index 100%
rename from os2/OS2/REXX/DLL/Changes
rename to os2/OS2/OS2-REXX/DLL/Changes
diff --git a/os2/OS2/REXX/DLL/DLL.pm b/os2/OS2/OS2-REXX/DLL/DLL.pm
similarity index 100%
rename from os2/OS2/REXX/DLL/DLL.pm
rename to os2/OS2/OS2-REXX/DLL/DLL.pm
diff --git a/os2/OS2/REXX/DLL/DLL.xs b/os2/OS2/OS2-REXX/DLL/DLL.xs
similarity index 100%
rename from os2/OS2/REXX/DLL/DLL.xs
rename to os2/OS2/OS2-REXX/DLL/DLL.xs
diff --git a/os2/OS2/REXX/DLL/MANIFEST b/os2/OS2/OS2-REXX/DLL/MANIFEST
similarity index 100%
rename from os2/OS2/REXX/DLL/MANIFEST
rename to os2/OS2/OS2-REXX/DLL/MANIFEST
diff --git a/os2/OS2/REXX/DLL/Makefile.PL b/os2/OS2/OS2-REXX/DLL/Makefile.PL
similarity index 100%
rename from os2/OS2/REXX/DLL/Makefile.PL
rename to os2/OS2/OS2-REXX/DLL/Makefile.PL
diff --git a/os2/OS2/REXX/MANIFEST b/os2/OS2/OS2-REXX/MANIFEST
similarity index 100%
rename from os2/OS2/REXX/MANIFEST
rename to os2/OS2/OS2-REXX/MANIFEST
diff --git a/os2/OS2/REXX/Makefile.PL b/os2/OS2/OS2-REXX/Makefile.PL
similarity index 100%
rename from os2/OS2/REXX/Makefile.PL
rename to os2/OS2/OS2-REXX/Makefile.PL
diff --git a/os2/OS2/REXX/REXX.pm b/os2/OS2/OS2-REXX/REXX.pm
similarity index 100%
rename from os2/OS2/REXX/REXX.pm
rename to os2/OS2/OS2-REXX/REXX.pm
diff --git a/os2/OS2/REXX/REXX.xs b/os2/OS2/OS2-REXX/REXX.xs
similarity index 100%
rename from os2/OS2/REXX/REXX.xs
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_cmprt.t
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_dllld.t
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_emxrv.t
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_objcall.t
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_sql.test
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_tiesql.test
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_tievar.t
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_tieydb.t
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_varset.t
rename to 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
similarity index 100%
rename from os2/OS2/REXX/t/rx_vrexx.t
rename to os2/OS2/OS2-REXX/t/rx_vrexx.t
diff --git a/os2/OS2/typemap b/os2/OS2/OS2-typemap
similarity index 100%
rename from os2/OS2/typemap
rename to os2/OS2/OS2-typemap