# HG changeset patch
# User Heiko Schlittermann <hs@schlittermann.de>
# Date 1294081615 -3600
# Node ID d3d2108f07da3fe7bafa93ba8865bfba04758afd
# Parent  e25fc893e203b2d2d7bfe15873ff361866c6fddb
dir for .pm is now dnstools.
Thus we can have dnstools::Config and so on.

diff -r e25fc893e203 -r d3d2108f07da Makefile
--- a/Makefile	Mon Jan 03 16:49:56 2011 +0100
+++ b/Makefile	Mon Jan 03 20:06:55 2011 +0100
@@ -1,3 +1,12 @@
+DESTDIR =
+
+prefix = /usr/local
+bindir = ${prefix}/bin
+sbindir = ${prefix}/sbin
+libdir = ${prefix}/lib/dnstools
+sysconfdir = /etc/dnstools
+
+
 ALL = zone-ls zone-mk zone-rm \
       update-serial \
       dnssec-keytool
diff -r e25fc893e203 -r d3d2108f07da dnssec-keytool.pl
--- a/dnssec-keytool.pl	Mon Jan 03 16:49:56 2011 +0100
+++ b/dnssec-keytool.pl	Mon Jan 03 20:06:55 2011 +0100
@@ -9,7 +9,7 @@
 use Pod::Usage;
 use File::Basename;
 use if $ENV{DEBUG} => "Smart::Comments";
-use my::Config qw(get_config);
+use dnstools::Config qw(get_config);
 
 my $ME = basename $0;
 
diff -r e25fc893e203 -r d3d2108f07da dnstools/Config.pm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dnstools/Config.pm	Mon Jan 03 20:06:55 2011 +0100
@@ -0,0 +1,36 @@
+package dnstools::Config;
+use strict;
+use warnings;
+
+use base "Exporter";
+
+our $VERSION   = 0.0;
+our @EXPORT_OK = qw(get_config);
+
+sub get_config(@) {
+
+    # read configuration
+    my @configs = @_;
+    my %config;
+
+    # the first config FILE
+    my ($_) = grep { -f } @configs;
+    open(my $cf, $_) or die "Can't open $_: $!\n";
+
+    while (<$cf>) {
+        s/#.*//;
+        s/\s//g;
+        next unless length;
+        my ($cname, $ccont) = split(/\s*=\s*/, $_, 2);
+        $config{$cname} = $ccont;
+    }
+
+    # now merge the config hashes
+    foreach my $o (grep { ref eq "HASH" } @configs) {
+        %config =
+          (%config, map { $_ => $o->{$_} } grep { defined $o->{$_} } keys %$o);
+    }
+    return %config;
+}
+
+1;
diff -r e25fc893e203 -r d3d2108f07da my/Config.pm
--- a/my/Config.pm	Mon Jan 03 16:49:56 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-package my::Config;
-use strict;
-use warnings;
-
-use base "Exporter";
-
-our $VERSION   = 0.0;
-our @EXPORT_OK = qw(get_config);
-
-sub get_config(@) {
-
-    # read configuration
-    my @configs = @_;
-    my %config;
-
-    # the first config FILE
-    my ($_) = grep { -f } @configs;
-    open(my $cf, $_) or die "Can't open $_: $!\n";
-
-    while (<$cf>) {
-        s/#.*//;
-        s/\s//g;
-        next unless length;
-        my ($cname, $ccont) = split(/\s*=\s*/, $_, 2);
-        $config{$cname} = $ccont;
-    }
-
-    # now merge the config hashes
-    foreach my $o (grep { ref eq "HASH" } @configs) {
-        %config =
-          (%config, map { $_ => $o->{$_} } grep { defined $o->{$_} } keys %$o);
-    }
-    return %config;
-}
-
-1;
diff -r e25fc893e203 -r d3d2108f07da update-serial.pl
--- a/update-serial.pl	Mon Jan 03 16:49:56 2011 +0100
+++ b/update-serial.pl	Mon Jan 03 20:06:55 2011 +0100
@@ -12,7 +12,7 @@
 use IO::File;
 use POSIX qw(strftime);
 use if $ENV{DEBUG} => "Smart::Comments";
-use my::Config qw(get_config);
+use dnstools::Config qw(get_config);
 
 sub uniq(@);
 sub zones(@);
diff -r e25fc893e203 -r d3d2108f07da zone-ls.pl
--- a/zone-ls.pl	Mon Jan 03 16:49:56 2011 +0100
+++ b/zone-ls.pl	Mon Jan 03 20:06:55 2011 +0100
@@ -9,7 +9,7 @@
 use Time::Local;
 use Getopt::Long;
 use if $ENV{DEBUG} => "Smart::Comments";
-use my::Config qw(get_config);
+use dnstools::Config qw(get_config);
 
 my %config;
 my $opt_expiry = undef;
diff -r e25fc893e203 -r d3d2108f07da zone-mk.pl
--- a/zone-mk.pl	Mon Jan 03 16:49:56 2011 +0100
+++ b/zone-mk.pl	Mon Jan 03 20:06:55 2011 +0100
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 use FindBin;
-use my::Config qw(get_config);
+use dnstools::Config qw(get_config);
 
 my %config;
 
diff -r e25fc893e203 -r d3d2108f07da zone-rm.pl
--- a/zone-rm.pl	Mon Jan 03 16:49:56 2011 +0100
+++ b/zone-rm.pl	Mon Jan 03 20:06:55 2011 +0100
@@ -4,7 +4,7 @@
 use strict;
 use File::Path;
 use FindBin;
-use my::Config qw(get_config);
+use dnstools::Config qw(get_config);
 
 # liest die Konfiguration ein
 my %config = get_config("$FindBin::Bin/dnstools.conf", "/etc/dnstools.conf");