1 files changed, 80 insertions, 74 deletions
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 65d0d2730..5b975e8a2 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -509,65 +509,92 @@
   vars.pm
   warnings.pm
   warnings/register.pm
-  ARCH-linux-thread-multi/B.pm
-  ARCH-linux-thread-multi/Config_git.pl
-  ARCH-linux-thread-multi/Config_heavy.pl
-  ARCH-linux-thread-multi/Config.pm
-  ARCH-linux-thread-multi/Cwd.pm
-  ARCH-linux-thread-multi/Data/Dumper.pm
-  ARCH-linux-thread-multi/DynaLoader.pm
-  ARCH-linux-thread-multi/Encode.pm
-  ARCH-linux-thread-multi/Encode/Alias.pm
-  ARCH-linux-thread-multi/Encode/Config.pm
-  ARCH-linux-thread-multi/Encode/Encoding.pm
-  ARCH-linux-thread-multi/Errno.pm
-  ARCH-linux-thread-multi/Fcntl.pm
-  ARCH-linux-thread-multi/File/Glob.pm
-  ARCH-linux-thread-multi/File/Spec.pm
-  ARCH-linux-thread-multi/File/Spec/Unix.pm
-  ARCH-linux-thread-multi/_h2ph_pre.ph
-  ARCH-linux-thread-multi/IO/File.pm
-  ARCH-linux-thread-multi/IO/Handle.pm
-  ARCH-linux-thread-multi/IO.pm
-  ARCH-linux-thread-multi/IO/Seekable.pm
-  ARCH-linux-thread-multi/IO/Select.pm
-  ARCH-linux-thread-multi/IO/Socket/INET.pm
-  ARCH-linux-thread-multi/IO/Socket.pm
-  ARCH-linux-thread-multi/IO/Socket/UNIX.pm
-  ARCH-linux-thread-multi/List/Util.pm
-  ARCH-linux-thread-multi/POSIX.pm
-  ARCH-linux-thread-multi/Scalar/Util.pm
-  ARCH-linux-thread-multi/Socket.pm
-  ARCH-linux-thread-multi/Time/HiRes.pm
-  <if ARCH="i.86|x86_64">
-  ARCH-linux-thread-multi/asm/unistd_32.ph
-  ARCH-linux-thread-multi/asm/unistd_64.ph
-  </if>
-  ARCH-linux-thread-multi/asm/unistd.ph
-  ARCH-linux-thread-multi/auto/B/B.so
-  ARCH-linux-thread-multi/auto/Cwd/Cwd.so
-  ARCH-linux-thread-multi/auto/Data/Dumper/Dumper.so
-  ARCH-linux-thread-multi/auto/Encode/Encode.so
-  ARCH-linux-thread-multi/auto/Fcntl/Fcntl.so
-  ARCH-linux-thread-multi/auto/File/Glob/Glob.so
-  ARCH-linux-thread-multi/auto/IO/IO.so
-  ARCH-linux-thread-multi/auto/List/Util/Util.so
-  ARCH-linux-thread-multi/auto/POSIX/POSIX.so
-  ARCH-linux-thread-multi/auto/re/re.so
-  ARCH-linux-thread-multi/auto/Socket/Socket.so
-  ARCH-linux-thread-multi/auto/Time/HiRes/HiRes.so
-  ARCH-linux-thread-multi/bits/syscall.ph
-  ARCH-linux-thread-multi/bits/wordsize.ph
-  ARCH-linux-thread-multi/lib.pm
-  ARCH-linux-thread-multi/re.pm
-  ARCH-linux-thread-multi/syscall.ph
-  ARCH-linux-thread-multi/sys/syscall.ph
   <if set="DEBUG_INSTALL">
     perl5db.pl
     Term/ReadLine.pm
   </if>
 </from>
 
+<from expand="main-perl-bin">
+  B.pm
+  Config_git.pl
+  Config_heavy.pl
+  Config.pm
+  Cwd.pm
+  Data/Dumper.pm
+  DynaLoader.pm
+  Encode.pm
+  Encode/Alias.pm
+  Encode/Config.pm
+  Encode/Encoding.pm
+  Errno.pm
+  Fcntl.pm
+  File/Glob.pm
+  File/Spec.pm
+  File/Spec/Unix.pm
+  _h2ph_pre.ph
+  IO/File.pm
+  IO/Handle.pm
+  IO.pm
+  IO/Seekable.pm
+  IO/Select.pm
+  IO/Socket/INET.pm
+  IO/Socket.pm
+  IO/Socket/UNIX.pm
+  List/Util.pm
+  POSIX.pm
+  Scalar/Util.pm
+  Socket.pm
+  Time/HiRes.pm
+  <if ARCH="i.86|x86_64">
+  asm/unistd_32.ph
+  asm/unistd_64.ph
+  </if>
+  asm/unistd.ph
+  auto/B/B.so
+  auto/Cwd/Cwd.so
+  auto/Data/Dumper/Dumper.so
+  auto/Encode/Encode.so
+  auto/Fcntl/Fcntl.so
+  auto/File/Glob/Glob.so
+  auto/IO/IO.so
+  auto/List/Util/Util.so
+  auto/POSIX/POSIX.so
+  auto/re/re.so
+  auto/Socket/Socket.so
+  auto/Time/HiRes/HiRes.so
+  bits/syscall.ph
+  bits/wordsize.ph
+  lib.pm
+  re.pm
+  syscall.ph
+  sys/syscall.ph
+</from>
+
+<from expand="perl-bin">
+  Cairo.pm
+  List/MoreUtils/XS.pm
+  Term/ReadKey.pm
+  XML/LibXML.pm
+  XML/LibXML/AttributeHash.pm
+  XML/LibXML/Error.pm
+  XML/LibXML/NodeList.pm
+  XML/LibXML/Reader.pm
+  XML/LibXML/XPathContext.pm
+  XML/LibXML/Boolean.pm
+  XML/LibXML/Literal.pm
+  XML/LibXML/Number.pm
+  auto/Cairo/Cairo.so
+  auto/Term/ReadKey/ReadKey.so
+  auto/XML/LibXML/LibXML.so
+  <if set="DEBUG_INSTALL">
+    Term/ReadLine/Gnu.pm
+    Term/ReadLine/Gnu/XS.pm
+    auto/Term/ReadLine/Gnu/Gnu.so
+    auto/Term/ReadLine/Gnu/XS/autosplit.ix
+  </if>
+</from>
+
 <from expand="perl">
   Config/IniFiles.pm
   Exporter/Tiny.pm
@@ -580,21 +607,6 @@
   Parse/EDID.pm
   String/ShellQuote.pm
   XML/SAX/Exception.pm
-  ARCH-linux-thread-multi/Cairo.pm
-  ARCH-linux-thread-multi/List/MoreUtils/XS.pm
-  ARCH-linux-thread-multi/Term/ReadKey.pm
-  ARCH-linux-thread-multi/XML/LibXML.pm
-  ARCH-linux-thread-multi/XML/LibXML/AttributeHash.pm
-  ARCH-linux-thread-multi/XML/LibXML/Error.pm
-  ARCH-linux-thread-multi/XML/LibXML/NodeList.pm
-  ARCH-linux-thread-multi/XML/LibXML/Reader.pm
-  ARCH-linux-thread-multi/XML/LibXML/XPathContext.pm
-  ARCH-linux-thread-multi/XML/LibXML/Boolean.pm
-  ARCH-linux-thread-multi/XML/LibXML/Literal.pm
-  ARCH-linux-thread-multi/XML/LibXML/Number.pm
-  ARCH-linux-thread-multi/auto/Cairo/Cairo.so
-  ARCH-linux-thread-multi/auto/Term/ReadKey/ReadKey.so
-  ARCH-linux-thread-multi/auto/XML/LibXML/LibXML.so
   urpm.pm
   urpm/args.pm
   urpm/cdrom.pm
@@ -616,12 +628,6 @@
   urpm/sys.pm
   urpm/xml_info.pm
   urpm/xml_info_pkg.pm
-  <if set="DEBUG_INSTALL">
-    ARCH-linux-thread-multi/Term/ReadLine/Gnu.pm
-    ARCH-linux-thread-multi/Term/ReadLine/Gnu/XS.pm
-    ARCH-linux-thread-multi/auto/Term/ReadLine/Gnu/Gnu.so
-    ARCH-linux-thread-multi/auto/Term/ReadLine/Gnu/XS/autosplit.ix
-  </if>
 </from>
 
 <from expand="rpm" matching="m!/usr/lib/perl5/.*/unicore/lib!">