From 943079dfdd2c6d73a1f2129da6b8d5ffeeae9dc0 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Fri, 20 Jul 2007 14:42:26 +0200
Subject: [PATCH] Split Perl modules to Sherlock and UCW namespaces as we
 already do with C libraries.

---
 build/Makebottom  | 10 ++++++----
 lib/perl/Makefile |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/Makebottom b/build/Makebottom
index 58cec87a..3214cac5 100644
--- 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 895fcb1a..c8dfb45b 100644
--- 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
-- 
2.39.2