diff options
| author | Deepti Kulkarni <deepti@vyatta.com> | 2011-12-16 04:19:02 -0800 |
|---|---|---|
| committer | Deepti Kulkarni <deepti@vyatta.com> | 2011-12-16 04:19:02 -0800 |
| commit | bad26964038fbe9d8b904e500c9fc3f90a70a005 (patch) | |
| tree | a0ca4f3c4a1b26789b4752228dbb9d97c2949ff7 /Makefile.am | |
| parent | f0f5874e15f2095bb2935d1b3bf92d321dc7c33f (diff) | |
| download | vyatta-conntrack-bad26964038fbe9d8b904e500c9fc3f90a70a005.tar.gz vyatta-conntrack-bad26964038fbe9d8b904e500c9fc3f90a70a005.zip | |
Resolved merge errors from Makefile.
Moved ConntrackUtil.pm to Conntrack dir.
Bug fix for 7676 for conntrack logging.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 34a92b9..46e3603 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ cfgdir = $(datadir)/vyatta-cfg/templates opdir = $(datadir)/vyatta-op/templates -share_perl5dir = $(datarootdir)/perl5/Vyatta +share_perl5dir = $(datarootdir)/perl5/Vyatta/Conntrack curverdir = $(sysconfdir)/config-migrate/current modprobedir = /etc/modprobe.d @@ -15,14 +15,13 @@ checkparamsonreboot_SCRIPTS = checkparamsonreboot_SCRIPTS += scripts/check-params-on-reboot.d/conntrack-hash-size share_perl5_DATA = lib/Vyatta/Conntrack/Config.pm +share_perl5_DATA += lib/Vyatta/Conntrack/ConntrackUtil.pm + sbin_SCRIPTS = scripts/vyatta-update-conntrack-log.pl bin_sudo_usersdir = $(bindir)/sudo-users bin_sudo_users_SCRIPTS = scripts/vyatta-show-conntrack.pl bin_sudo_users_SCRIPTS += scripts/vyatta-delete-conntrack.pl - -share_perl5_DATA = lib/Vyatta/ConntrackUtil.pm - curver_DATA = cfg-version/conntrack@1 modprobe_DATA = etc/modprobe.d/vyatta_nf_conntrack.conf |