Revert "pidl: Install pidl files corrently."

This reverts commit cee11cfa4544425099268cd32393169afb4bb107.

Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build
index 9bddf3f39c89097fe0043e4c98c1f9d8fc37d1cb..eb5f1e0c3792e03ad57aaf51eff496b91eb31ce3 100644 (file)
--- a/pidl/lib/wscript_build
+++ b/pidl/lib/wscript_build
@@ -1,33 +1,4 @@
 #!/usr/bin/env python
 
 # install the pidl modules
-bld.INSTALL_FILES('${DATAROOTDIR}/perl5',
-                  '''
-                  Parse/Pidl.pm
-                  Parse/Pidl/Samba4.pm
-                  Parse/Pidl/CUtil.pm
-                  Parse/Pidl/Expr.pm
-                  Parse/Pidl/Wireshark/Conformance.pm
-                  Parse/Pidl/Wireshark/NDR.pm
-                  Parse/Pidl/ODL.pm
-                  Parse/Pidl/Dump.pm
-                  Parse/Pidl/Util.pm
-                  Parse/Pidl/Samba4/Header.pm
-                  Parse/Pidl/Samba4/COM/Header.pm
-                  Parse/Pidl/Samba4/COM/Proxy.pm
-                  Parse/Pidl/Samba4/COM/Stub.pm
-                  Parse/Pidl/Samba4/TDR.pm
-                  Parse/Pidl/Samba4/NDR/Server.pm
-                  Parse/Pidl/Samba4/NDR/Client.pm
-                  Parse/Pidl/Samba4/NDR/Parser.pm
-                  Parse/Pidl/Samba4/Python.pm
-                  Parse/Pidl/Samba4/Template.pm
-                  Parse/Pidl/IDL.pm
-                  Parse/Pidl/Typelist.pm
-                  Parse/Pidl/Samba3/ClientNDR.pm
-                  Parse/Pidl/Samba3/ServerNDR.pm
-                  Parse/Pidl/Compat.pm
-                  Parse/Pidl/NDR.pm
-                  Parse/Yapp/Driver.pm
-                  ''',
-                  flat=False)
+bld.INSTALL_WILDCARD('${DATAROOTDIR}/perl5', '**/*.pm', flat=False)

diff --git a/pidl/wscript b/pidl/wscript
index 05d9982adfecf44c79f44fd28e26dcb735c6561e..7a25734663406e88d997212dddc6aa6458a726b5 100644 (file)
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -26,6 +26,9 @@ def build(bld):
     if not bld.CONFIG_SET('HAVE_PERL_MAKEMAKER'):
         return
 
+    pidl_src = ['pidl']
+    pidl_src.extend(bld.path.ant_glob('lib/**/*.pm').split())
+
     pidl_manpages = {
         'pidl': 'man1/pidl.${PERLMAN1EXT}',
         'lib/Parse/Pidl/NDR.pm': 'man3/Parse::Pidl::NDR.${PERLMAN3EXT}',