Split Perl modules to Sherlock and UCW namespaces as we already do with C libraries.

diff --git a/build/Makebottom b/build/Makebottom
index 58cec87a8bc4e8acb374e20931c4f095ef2a1efe..3214cac526069511c327cb21b6d646ee8801c768 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -161,15 +161,17 @@ $(o)/%: %.pl $(o)/config.mk $(s)/build/genconf
        $(Q)chmod +x $@
        $(Q)$(call symlink,$@,run/$(BINDIR))
 
+PERL_MODULE_DIR=UCW
+
 $(o)/%.pm: $(s)/%.pm
-       $(M)PM $<
+       $(M)"PM $< -> run/lib/perl5/$(PERL_MODULE_DIR)/$(@F)"
        $(Q)cp $^ $@
-       $(Q)$(call symlink,$@,run/lib/perl5/Sherlock)
+       $(Q)$(call symlink,$@,run/lib/perl5/$(PERL_MODULE_DIR))
 
 $(o)/%.pm: %.pm
-       $(M)PM $<
+       $(M)"PM $< -> run/lib/perl/$(PERL_MODULE_DIR)/$(@F)"
        $(Q)cp $^ $@
-       $(Q)$(call symlink,$@,run/lib/perl5/Sherlock)
+       $(Q)$(call symlink,$@,run/lib/perl5/$(PERL_MODULE_DIR))
 
 # Rules for data files
 

diff --git a/lib/perl/Makefile b/lib/perl/Makefile
index 895fcb1a11a9332dde71179c20d5e56af688da95..c8dfb45bc72538ef53e45a744c7bef76a51d2de0 100644 (file)
--- a/lib/perl/Makefile
+++ b/lib/perl/Makefile
@@ -1,6 +1,7 @@
 # Perl modules
 
 DIRS+=lib/perl
+EXTRA_RUNDIRS+=lib/perl5/UCW
 PROGS+=$(addprefix $(o)/lib/perl/,Config.pm Log.pm)
 
 ifdef CONFIG_UCW_PERL_MODULES