From 89f86d97def2a365b1799f70e3f254264b9c7615 Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Wed, 8 Oct 2008 21:53:47 +0200 Subject: [PATCH] Move UCW perl modules to their directory This way they can be found from the source directory (needed for configure) --- free/libs/configure | 2 +- free/libs/examples/internal/configure | 2 +- ucw/perl/Makefile | 4 ++-- ucw/perl/{ => UCW}/CGI.pm | 0 ucw/perl/{ => UCW}/Config.pm | 0 ucw/perl/{ => UCW}/Configure.pm | 0 ucw/perl/{ => UCW}/Log.pm | 0 ucw/perl/UCW/Makefile | 4 ++++ 8 files changed, 8 insertions(+), 4 deletions(-) rename ucw/perl/{ => UCW}/CGI.pm (100%) rename ucw/perl/{ => UCW}/Config.pm (100%) rename ucw/perl/{ => UCW}/Configure.pm (100%) rename ucw/perl/{ => UCW}/Log.pm (100%) create mode 100644 ucw/perl/UCW/Makefile diff --git a/free/libs/configure b/free/libs/configure index a359da28..6728ce20 100755 --- a/free/libs/configure +++ b/free/libs/configure @@ -17,7 +17,7 @@ BEGIN { die "Don't know how to find myself. Please set SRCDIR manually."; } } - require "$srcdir/ucw/perl/Configure.pm"; + require "$srcdir/ucw/perl/UCW/Configure.pm"; UCW::Configure::import UCW::Configure; } diff --git a/free/libs/examples/internal/configure b/free/libs/examples/internal/configure index 034d43d6..6f4a678d 100755 --- a/free/libs/examples/internal/configure +++ b/free/libs/examples/internal/configure @@ -17,7 +17,7 @@ BEGIN { die "Don't know how to find myself. Please set SRCDIR manually."; } } - require "$srcdir/ucw/perl/Configure.pm"; + require "$srcdir/ucw/perl/UCW/Configure.pm"; UCW::Configure::import UCW::Configure; } diff --git a/ucw/perl/Makefile b/ucw/perl/Makefile index 293ea216..787d5e75 100644 --- a/ucw/perl/Makefile +++ b/ucw/perl/Makefile @@ -1,8 +1,8 @@ # Perl modules DIRS+=ucw/perl -EXTRA_RUNDIRS+=lib/perl5/UCW -PROGS+=$(addprefix $(o)/ucw/perl/,Config.pm Log.pm CGI.pm) + +include $(s)/ucw/perl/UCW/Makefile ifdef CONFIG_UCW_PERL_MODULES include $(s)/ucw/perl/Ulimit/Makefile diff --git a/ucw/perl/CGI.pm b/ucw/perl/UCW/CGI.pm similarity index 100% rename from ucw/perl/CGI.pm rename to ucw/perl/UCW/CGI.pm diff --git a/ucw/perl/Config.pm b/ucw/perl/UCW/Config.pm similarity index 100% rename from ucw/perl/Config.pm rename to ucw/perl/UCW/Config.pm diff --git a/ucw/perl/Configure.pm b/ucw/perl/UCW/Configure.pm similarity index 100% rename from ucw/perl/Configure.pm rename to ucw/perl/UCW/Configure.pm diff --git a/ucw/perl/Log.pm b/ucw/perl/UCW/Log.pm similarity index 100% rename from ucw/perl/Log.pm rename to ucw/perl/UCW/Log.pm diff --git a/ucw/perl/UCW/Makefile b/ucw/perl/UCW/Makefile new file mode 100644 index 00000000..d6f2db1c --- /dev/null +++ b/ucw/perl/UCW/Makefile @@ -0,0 +1,4 @@ + +DIRS+=ucw/perl/UCW +EXTRA_RUNDIRS+=lib/perl5/UCW +PROGS+=$(addprefix $(o)/ucw/perl/UCW/,Config.pm Log.pm CGI.pm) -- 2.39.2