diff options
| author | Daniil Baturin <daniil.baturin@vyatta.com> | 2011-11-23 21:25:23 +0700 |
|---|---|---|
| committer | Daniil Baturin <daniil.baturin@vyatta.com> | 2011-11-23 21:25:23 +0700 |
| commit | fd1ffdcc7d692e1c2bebf4cd4d20c4688cfdca5a (patch) | |
| tree | d02006940fafa4653ea933dc1d8d2cc5c6e2ffa0 /Makefile.am | |
| parent | 94e02c7f23d814c16f3854ec756e27ddcd0c4b27 (diff) | |
| parent | 993107b2d411024acc3491d22a8e6aa47adde66b (diff) | |
| download | vyatta-conntrack-fd1ffdcc7d692e1c2bebf4cd4d20c4688cfdca5a.tar.gz vyatta-conntrack-fd1ffdcc7d692e1c2bebf4cd4d20c4688cfdca5a.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-conntrack into oxnard
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index eec3ae8..94c39d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,17 @@ cfgdir = $(datadir)/vyatta-cfg/templates +opdir = $(datadir)/vyatta-op/templates curverdir = $(sysconfdir)/config-migrate/current modprobedir = /etc/modprobe.d -checkparamsonrebootdir = $(bindir)/sudo-users/check-params-on-reboot.d +checkparamsonrebootdir = $(bindir)/sudo-users/check-params-on-reboot.d checkparamsonreboot_SCRIPTS = checkparamsonreboot_SCRIPTS += scripts/check-params-on-reboot.d/conntrack-hash-size +bin_sudo_usersdir = $(bindir)/sudo-users +bin_sudo_users_SCRIPTS = scripts/vyatta-show-conntrack.pl +bin_sudo_users_SCRIPTS += scripts/vyatta-delete-conntrack.pl + + curver_DATA = cfg-version/conntrack@1 modprobe_DATA = etc/modprobe.d/vyatta_nf_conntrack.conf @@ -16,3 +22,5 @@ cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ install-exec-hook: mkdir -p $(DESTDIR)$(cfgdir) cd templates-cfg; $(cpiop) $(DESTDIR)$(cfgdir) + mkdir -p $(DESTDIR)$(opdir) + cd templates-op; $(cpiop) $(DESTDIR)$(opdir) |