Startup belongs to the package

diff --git a/PciIds/Config.pm b/PciIds/Config.pm
index a17968905c3ac1d78392fb5673185594ebaf95e5..8d7a98affe2f76f952854a284632d111fac1eab6 100644 (file)
--- a/PciIds/Config.pm
+++ b/PciIds/Config.pm
@@ -1,7 +1,7 @@
 package PciIds::Config;
 use strict;
 use warnings;
-use Startup;
+use PciIds::Startup;
 use base 'Exporter';
 
 our @EXPORT = qw(&checkConf &defConf %config &confList);

diff --git a/PciIds/Startup.pm b/PciIds/Startup.pm
new file mode 100644 (file)
index 0000000..c8284d9
--- /dev/null
+++ b/PciIds/Startup.pm
@@ -0,0 +1,13 @@
+package PciIds::Startup;
+use strict;
+use warnings;
+use base 'Exporter';
+
+#Where are data?
+our $directory = '/home/vorner/prog/pciids/';
+our @EXPORT=qw($directory);
+
+#Where are the modules?
+use lib ( '/home/vorner/prog/pciids/' );
+
+1;

diff --git a/PciIds/Users.pm b/PciIds/Users.pm
index d437f9cc96eec534c4a359e52a67e51a277ea135..3f6e38eebdb3bdf4073a34168af61a20ff3aba0e 100644 (file)
--- a/PciIds/Users.pm
+++ b/PciIds/Users.pm
@@ -7,7 +7,7 @@ use DBI;
 use PciIds::Config;
 use Digest::MD5 qw(md5_base64 md5_hex);#TODO Some better algorithm?
 use HTML::Entities;
-use Startup;
+use PciIds::Startup;
 use PciIds::Log;
 use Apache2::Connection;
 

diff --git a/Startup.pm b/Startup.pm
deleted file mode 100644 (file)
index fcda725..0000000
--- a/Startup.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package Startup;
-use strict;
-use warnings;
-use base 'Exporter';
-
-#Where are data?
-our $directory = '/home/vorner/prog/pciids/';
-our @EXPORT=qw($directory);
-
-#Where are the modules?
-use lib ( '/home/vorner/prog/pciids/' );
-
-1;