diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 00:55:14 -0600 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 00:55:14 -0600 |
| commit | 1a95ae591bbbaa1071c4eb16991d5064f3be696c (patch) | |
| tree | 4c3dc660f8411c8b64ab0418329f60f7c41fdf6a /chapter8/iproute2.sh | |
| parent | 2c8204d6325a1a6607392d5905227b9043da17cc (diff) | |
| parent | 6132c19762b7d74ba7ad06e291b6401c632bbc28 (diff) | |
Major changes
Diffstat (limited to 'chapter8/iproute2.sh')
| -rw-r--r-- | chapter8/iproute2.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/chapter8/iproute2.sh b/chapter8/iproute2.sh index cb8dd77..edd989d 100644 --- a/chapter8/iproute2.sh +++ b/chapter8/iproute2.sh @@ -1,3 +1,4 @@ +<<<<<<< HEAD #!/bin/bash
set -e
@@ -9,3 +10,18 @@ sed -i 's/.m_ipt.o//' tc/Makefile && make &&
make DOCDIR=/usr/share/doc/iproute2-"${VERSION}" -j1 install
+======= +#!/bin/bash +set -e + +sed -i /ARPD/d Makefile && +rm -fv man/man8/arpd.8 && + +sed -i 's/.m_ipt.o//' tc/Makefile && + +make && + +make -j1 install +mkdir -v /usr/share/doc/iproute2-"${VERSION}" +cp -v COPYING README* /usr/share/doc/iproute2-"${VERSION}" +>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28 |