diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2011-12-15 17:26:10 -0800 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2011-12-15 17:26:10 -0800 |
| commit | 726332166821253c36995aaa690923d159c08274 (patch) | |
| tree | 24450b99510020dcc964a34ed46b5c26dee9827d /Makefile.am | |
| parent | 7aaa5c08f46203cd6bdf3c9c12e6c9185341c616 (diff) | |
| parent | 7b98a85b8b777182e698d0c2c4e668fa90245555 (diff) | |
| download | vyatta-conntrack-726332166821253c36995aaa690923d159c08274.tar.gz vyatta-conntrack-726332166821253c36995aaa690923d159c08274.zip | |
Bug 7676: including unstaged changes for 7677
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index a2061a3..c1f28a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,24 @@ cfgdir = $(datadir)/vyatta-cfg/templates opdir = $(datadir)/vyatta-op/templates +<<<<<<< HEAD share_perl5dir = $(datarootdir)/perl5/Vyatta +======= +>>>>>>> 7b98a85b8b777182e698d0c2c4e668fa90245555 curverdir = $(sysconfdir)/config-migrate/current modprobedir = /etc/modprobe.d +vprefix = /opt/vyatta +vsbindir = $(vprefix)/sbin + +vsbin_PROGRAMS = src/vyatta-conntrack-logging +vyatta_conntrack_logging_SOURCES = vyatta-conntrack-logging.c + checkparamsonrebootdir = $(bindir)/sudo-users/check-params-on-reboot.d checkparamsonreboot_SCRIPTS = checkparamsonreboot_SCRIPTS += scripts/check-params-on-reboot.d/conntrack-hash-size +share_perl5_DATA = lib/Vyatta/Conntrack/Config.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 |