diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-11-21 16:34:31 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-11-21 16:34:31 -0800 |
| commit | 2538236910083bde8247cd21c6107be7b7d840f7 (patch) | |
| tree | 89a68354f9a2ef75d6e46eb479b129787cb8e0d1 | |
| parent | cb9f44e27eda150ab2e7bb2c34fa9feb34112b0c (diff) | |
| download | vyatta-nat-2538236910083bde8247cd21c6107be7b7d840f7.tar.gz vyatta-nat-2538236910083bde8247cd21c6107be7b7d840f7.zip | |
Rename VyattaNatRule to Vyatta::NatRule
Rearrange perl modules
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | lib/Vyatta/NatRule.pm (renamed from scripts/VyattaNatRule.pm) | 8 | ||||
| -rwxr-xr-x | scripts/vyatta-show-nat.pl | 4 | ||||
| -rwxr-xr-x | scripts/vyatta-update-nat.pl | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index b6e68e2..5e64761 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ cfgdir = $(datadir)/vyatta-cfg/templates opdir = $(datadir)/vyatta-op/templates xsldir = $(datadir)/xsl -share_perl5dir = $(datadir)/perl5 +share_perl5dir = $(datadir)/perl5/Vyatta bin_sudo_usersdir = $(bindir)/sudo-users curverdir = $(sysconfdir)/config-migrate/current @@ -11,7 +11,7 @@ sbin_SCRIPTS += scripts/vyatta-show-nat.pl bin_sudo_users_SCRIPTS = scripts/vyatta-clear-nat bin_sudo_users_SCRIPTS += scripts/vyatta-nat-translations.pl -share_perl5_DATA = scripts/VyattaNatRule.pm +share_perl5_DATA = lib/Vyatta/NatRule.pm curver_DATA = cfg-version/nat@3 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ diff --git a/scripts/VyattaNatRule.pm b/lib/Vyatta/NatRule.pm index a648035..49029df 100644 --- a/scripts/VyattaNatRule.pm +++ b/lib/Vyatta/NatRule.pm @@ -1,11 +1,11 @@ -package VyattaNatRule; +package Vyatta::NatRule; use strict; -use lib "/opt/vyatta/share/perl5/"; -use VyattaConfig; +use lib "/opt/vyatta/share/perl5"; +require VyattaConfig; +require Vyatta::IpTablesAddressFilter; use VyattaMisc; use VyattaTypeChecker; -use VyattaIpTablesAddressFilter; my $src = new VyattaIpTablesAddressFilter; my $dst = new VyattaIpTablesAddressFilter; diff --git a/scripts/vyatta-show-nat.pl b/scripts/vyatta-show-nat.pl index 2d3c773..8abce6d 100755 --- a/scripts/vyatta-show-nat.pl +++ b/scripts/vyatta-show-nat.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl use strict; -use lib "/opt/vyatta/share/perl5/"; +use lib "/opt/vyatta/share/perl5"; use VyattaConfig; -use VyattaNatRule; +use Vyatta::NatRule; sub numerically { $a <=> $b; } diff --git a/scripts/vyatta-update-nat.pl b/scripts/vyatta-update-nat.pl index a8d4cd3..9842309 100755 --- a/scripts/vyatta-update-nat.pl +++ b/scripts/vyatta-update-nat.pl @@ -1,9 +1,9 @@ -#!/usr/bin/perl + #!/usr/bin/perl use strict; use lib "/opt/vyatta/share/perl5/"; use VyattaConfig; -use VyattaNatRule; +use Vyatta::NatRule; sub numerically { $a <=> $b; } |