From 28b951bd60ffe064fc7328d11dd5829addf79b41 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 14 Jan 2007 18:56:22 +0000
Subject: * adjusted scripts and Makefile to new directory layout

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@628 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 Makefile                                     | 2 ++
 config-db/devel-tools/create-simple-db.pl    | 5 +++--
 config-db/devel-tools/extractTranslations.pl | 2 --
 config-db/devel-tools/test-config-db.pl      | 6 ++++--
 config-db/devel-tools/test-config-demuxer.pl | 6 ++++--
 config-db/slxconfig-demuxer                  | 3 +--
 config-db/slxldd                             | 6 +-----
 config-db/slxsettings                        | 5 ++---
 config-db/slxsetup                           | 3 ---
 9 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 37928d4b..ae726f58 100644
--- a/Makefile
+++ b/Makefile
@@ -133,6 +133,8 @@ supported."; \
 
 	@# copy all PERL-scripts from config-db and their required modules:
 	@cp config-db/slx* $(SLX_BIN_PATH)/
+	@tar --exclude=.svn -cp -C lib OpenSLX | \
+	  tar -xp -C $(SLX_BASE_PATH)/lib
 	@tar --exclude=.svn -cp -C config-db OpenSLX | \
 	  tar -xp -C $(SLX_BASE_PATH)/lib
 
diff --git a/config-db/devel-tools/create-simple-db.pl b/config-db/devel-tools/create-simple-db.pl
index 1fd8f242..efb7d7ab 100755
--- a/config-db/devel-tools/create-simple-db.pl
+++ b/config-db/devel-tools/create-simple-db.pl
@@ -20,11 +20,12 @@ create-simple-db.pl
 use Getopt::Long qw(:config pass_through);
 use Pod::Usage;
 
-# add the lib-folder and the folder this script lives in to perl's search
+# add the lib-folder and the config-db folder to perl's search
 # path for modules:
 use FindBin;
+use lib "$FindBin::RealBin/../../lib";
 use lib "$FindBin::RealBin/..";
-	# development path
+	# development path to config-db stuff
 
 use OpenSLX::Basics;
 use OpenSLX::ConfigDB qw(:access :manipulation);
diff --git a/config-db/devel-tools/extractTranslations.pl b/config-db/devel-tools/extractTranslations.pl
index 3907a184..223fb050 100755
--- a/config-db/devel-tools/extractTranslations.pl
+++ b/config-db/devel-tools/extractTranslations.pl
@@ -24,8 +24,6 @@ use File::Find;
 use Getopt::Long;
 use Pod::Usage;
 
-use Text::ParseWords;
-
 my (
 	$helpReq,
 	$show,
diff --git a/config-db/devel-tools/test-config-db.pl b/config-db/devel-tools/test-config-db.pl
index aa6267bd..0d196130 100755
--- a/config-db/devel-tools/test-config-db.pl
+++ b/config-db/devel-tools/test-config-db.pl
@@ -8,10 +8,12 @@
 #
 use strict;
 
-# add the folder this script lives in to perl's search path for modules:
+# add the lib-folder and the config-db folder to perl's search
+# path for modules:
 use FindBin;
+use lib "$FindBin::RealBin/../../lib";
 use lib "$FindBin::RealBin/..";
-	# development path only (as script should never be installed)
+	# development path to config-db stuff
 
 use OpenSLX::Basics;
 use OpenSLX::ConfigDB qw(:access :manipulation);
diff --git a/config-db/devel-tools/test-config-demuxer.pl b/config-db/devel-tools/test-config-demuxer.pl
index 82003f18..43447dd9 100755
--- a/config-db/devel-tools/test-config-demuxer.pl
+++ b/config-db/devel-tools/test-config-demuxer.pl
@@ -8,10 +8,12 @@
 #
 use strict;
 
-# add the folder this script lives in to perl's search path for modules:
+# add the lib-folder and the config-db folder to perl's search
+# path for modules:
 use FindBin;
+use lib "$FindBin::RealBin/../../lib";
 use lib "$FindBin::RealBin/..";
-	# development path only (as script should never be installed)
+	# development path to config-db stuff
 
 use OpenSLX::Basics;
 use OpenSLX::ConfigDB qw(:access :manipulation);
diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index 5876672d..a733083b 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -32,9 +32,8 @@ use Pod::Usage;
 # path for modules:
 use FindBin;
 use lib "$FindBin::RealBin/../lib";
-	# production path
 use lib "$FindBin::RealBin";
-	# development path
+	# development path to config-db stuff
 
 use OpenSLX::Basics;
 use OpenSLX::ConfigDB qw(:access :aggregation :support);
diff --git a/config-db/slxldd b/config-db/slxldd
index 212b6fe8..b5bc9c9f 100755
--- a/config-db/slxldd
+++ b/config-db/slxldd
@@ -22,13 +22,9 @@ use File::Glob ':globally';
 use Getopt::Long;
 use Pod::Usage;
 
-# add the lib-folder and the folder this script lives in to perl's search
-# path for modules:
+# add the lib-folder to perl's search path for modules:
 use FindBin;
 use lib "$FindBin::RealBin/../lib";
-	# production path
-use lib "$FindBin::RealBin/..";
-	# development path
 
 use OpenSLX::Basics;
 
diff --git a/config-db/slxsettings b/config-db/slxsettings
index 008d760c..ce8a9e38 100755
--- a/config-db/slxsettings
+++ b/config-db/slxsettings
@@ -28,9 +28,8 @@ use Pod::Usage;
 # path for modules:
 use FindBin;
 use lib "$FindBin::RealBin/../lib";
-	# production path
-use lib "$FindBin::RealBin/..";
-	# development path
+use lib "$FindBin::RealBin";
+	# development path to config-db stuff
 
 use OpenSLX::Basics;
 use OpenSLX::ConfigDB qw(:access :manipulation);
diff --git a/config-db/slxsetup b/config-db/slxsetup
index 80734b2f..2e317457 100755
--- a/config-db/slxsetup
+++ b/config-db/slxsetup
@@ -24,9 +24,6 @@ use Pod::Usage;
 # path for modules:
 use FindBin;
 use lib "$FindBin::RealBin/../lib";
-	# production path
-use lib "$FindBin::RealBin/..";
-	# development path to basic stuff
 use lib "$FindBin::RealBin";
 	# development path to config-db stuff
 
-- 
cgit v1.2.3-55-g7522