diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:06:04 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:06:04 +0200 |
| commit | 1e57b56f271d55bee4e1118f4f4f9aad27b813ce (patch) | |
| tree | 52644fe91c46af6dbad1edf2664e2f359ed6c992 /Makefile.am | |
| parent | a2574ad42f708aa662bc9fc7bbbf0badf8349bd1 (diff) | |
| parent | 90daa5e2cf02ffd3fd5936b4f372f1e85ab62ef6 (diff) | |
| download | vyatta-cfg-vpn-lithium.tar.gz vyatta-cfg-vpn-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
scripts/vpn-config.pl
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 7ae1717..ff81363 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,9 +31,9 @@ install-exec-hook: cd templates; $(cpiop) $(DESTDIR)$(cfgdir) mkdir -p $(DESTDIR)/etc/ppp/ip-up.d mkdir -p $(DESTDIR)/etc/ppp/ip-down.d - mkdir -p $(DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/ + mkdir -p $(DESTDIR)/etc/dhcp/dhclient-exit-hooks.d/ mkdir -p $(DESTDIR)/usr/lib/ipsec/ cp scripts/vpn-ppp-up $(DESTDIR)/etc/ppp/ip-up.d/ cp scripts/vpn-ppp-down $(DESTDIR)/etc/ppp/ip-down.d/ - cp scripts/ipsecd-dhclient-hook $(DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/ipsecd + cp scripts/ipsecd-dhclient-hook $(DESTDIR)/etc/dhcp/dhclient-exit-hooks.d/ipsecd cp scripts/vti-up-down $(DESTDIR)/usr/lib/ipsec/ |