diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | config-db/slxconfig-demuxer.pl | 8 | ||||
| -rwxr-xr-x | config-db/slxsetup-test-data-simple.pl | 8 | ||||
| -rwxr-xr-x | config-db/slxsetup.pl | 8 | ||||
| -rwxr-xr-x | config-db/test-config-db.pl | 8 | ||||
| -rwxr-xr-x | config-db/test-config-demuxer.pl | 8 |
6 files changed, 33 insertions, 11 deletions
@@ -81,6 +81,7 @@ tarball: install: @echo "Installing OpenSLX project files" @mkdir -p $(SLX_CONFIG_PATH) \ + -p $(SLX_BASE_PATH)/lib \ -p $(SLX_BIN_PATH) \ -p $(SLX_SHARE_PATH)/templates \ -p $(SLX_SHARE_PATH)/initramfs \ @@ -101,7 +102,8 @@ install: @# copy all PERL-scripts from config-db and their required modules: @cp config-db/slx* $(SLX_BIN_PATH)/ - @tar --exclude=.svn -cp -C config-db OpenSLX | tar -xp -C $(SLX_BIN_PATH) + @tar --exclude=.svn -cp -C config-db OpenSLX | \ + tar -xp -C $(SLX_BASE_PATH)/lib @# link all binaries & scripts into user-path: @ln -sf $(SLX_BIN_PATH)/slx* $(USR_BIN_PATH)/ diff --git a/config-db/slxconfig-demuxer.pl b/config-db/slxconfig-demuxer.pl index 75ee2cd8..74c7fba0 100755 --- a/config-db/slxconfig-demuxer.pl +++ b/config-db/slxconfig-demuxer.pl @@ -1,9 +1,13 @@ #! /usr/bin/perl use strict; -# add the folder this script lives in to perl's search path for modules: +# add the lib-folder and the folder this script lives in to perl's search +# path for modules: use FindBin; -use lib $FindBin::Bin; +use lib "$FindBin::RealBin/../lib"; + # production path +use lib "$FindBin::RealBin"; + # development path use Fcntl qw(:DEFAULT :flock); use File::Basename; diff --git a/config-db/slxsetup-test-data-simple.pl b/config-db/slxsetup-test-data-simple.pl index 49d4a316..7fb47930 100755 --- a/config-db/slxsetup-test-data-simple.pl +++ b/config-db/slxsetup-test-data-simple.pl @@ -1,8 +1,12 @@ #! /usr/bin/perl -# add the folder this script lives in to perl's search path for modules: +# add the lib-folder and the folder this script lives in to perl's search +# path for modules: use FindBin; -use lib $FindBin::Bin; +use lib "$FindBin::RealBin/../lib"; + # production path +use lib "$FindBin::RealBin"; + # development path use OpenSLX::Basics; use OpenSLX::ConfigDB qw(:access :manipulation); diff --git a/config-db/slxsetup.pl b/config-db/slxsetup.pl index 1d66a50f..8b28cef2 100755 --- a/config-db/slxsetup.pl +++ b/config-db/slxsetup.pl @@ -1,8 +1,12 @@ #! /usr/bin/perl -# add the folder this script lives in to perl's search path for modules: +# add the lib-folder and the folder this script lives in to perl's search +# path for modules: use FindBin; -use lib $FindBin::Bin; +use lib "$FindBin::RealBin/../lib"; + # production path +use lib "$FindBin::RealBin"; + # development path use OpenSLX::Basics; diff --git a/config-db/test-config-db.pl b/config-db/test-config-db.pl index a1d9e5d3..63c914a9 100755 --- a/config-db/test-config-db.pl +++ b/config-db/test-config-db.pl @@ -1,8 +1,12 @@ #! /usr/bin/perl -# add the folder this script lives in to perl's search path for modules: +# add the lib-folder and the folder this script lives in to perl's search +# path for modules: use FindBin; -use lib $FindBin::Bin; +use lib "$FindBin::RealBin/../lib"; + # production path +use lib "$FindBin::RealBin"; + # development path use OpenSLX::Basics; use OpenSLX::ConfigDB qw(:access :manipulation); diff --git a/config-db/test-config-demuxer.pl b/config-db/test-config-demuxer.pl index 0494a413..91fa38bc 100755 --- a/config-db/test-config-demuxer.pl +++ b/config-db/test-config-demuxer.pl @@ -1,9 +1,13 @@ #! /usr/bin/perl use strict; -# add the folder this script lives in to perl's search path for modules: +# add the lib-folder and the folder this script lives in to perl's search +# path for modules: use FindBin; -use lib $FindBin::Bin; +use lib "$FindBin::RealBin/../lib"; + # production path +use lib "$FindBin::RealBin"; + # development path use OpenSLX::Basics; use OpenSLX::ConfigDB qw(:access :manipulation); |