iproute2 - Split up manual page installation. Generate manual pages based on where the config files are installed. Add missing manual pages for utilities which are links to other binaries. Make tc-pfifo.8 a real file that points to tc-bfifo.8 instead of symlink which causes problems with compressing manual pages.

PATCH In review Christoph J. Thompson 1 participant 1 message Mar 1, 2012

Subsystems (3)

Networking Network drivers Kbuild

lore

Share & tools

lore

Christoph J. Thompson

author

2012-03-01 16:45 UTC #0 lore raw

PATCH 3/4 iproute2 - Split up manual page installation. Generate manual pages based on where the config files are installed. Add missing manual pages for utilities which are links to other binaries. Make tc-pfifo.8 a real file that points to tc-bfifo.8 instead of symlink which causes problems with compressing manual pages.

	modified:   Makefile
	new file:   man/Makefile
	new file:   man/man3/Makefile
	new file:   man/man8/Makefile
	new file:   man/man8/ctstat.8
	new file:   man/man8/ip-address.8.in
	new file:   man/man8/ip-link.8.in
	new file:   man/man8/ip-route.8.in
	new file:   man/man8/nstat.8
	new file:   man/man8/routef.8
	new file:   man/man8/rtstat.8

typechange: man/man8/tc-pfifo.8

Signed-off-by Christoph J. Thompson <[email protected]>

---
 Makefile                 |   13 +-
 man/Makefile             |   20 ++
 man/man3/Makefile        |   13 +
 man/man8/Makefile        |   29 ++
 man/man8/ctstat.8        |    1 +
 man/man8/ip-address.8.in |  240 +++++++++++++++
 man/man8/ip-link.8.in    |  374 +++++++++++++++++++++++
 man/man8/ip-route.8.in   |  744 ++++++++++++++++++++++++++++++++++++++++++++++
 man/man8/nstat.8         |    1 +
 man/man8/routef.8        |    1 +
 man/man8/rtstat.8        |    1 +
 man/man8/tc-pfifo.8      |    2 +-
 12 files changed, 1426 insertions(+), 13 deletions(-)
 create mode 100644 man/Makefile
 create mode 100644 man/man3/Makefile
 create mode 100644 man/man8/Makefile
 create mode 100644 man/man8/ctstat.8
 create mode 100644 man/man8/ip-address.8.in
 create mode 100644 man/man8/ip-link.8.in
 create mode 100644 man/man8/ip-route.8.in
 create mode 100644 man/man8/nstat.8
 create mode 100644 man/man8/routef.8
 create mode 100644 man/man8/rtstat.8
 mode change 120000 => 100644 man/man8/tc-pfifo.8

Makefile +1 ~~-12~~

index 014d497..fb5f5d3 100644
@@ -35,7 +35,7 @@ WFLAGS = -Wall -Wstrict-prototypes
 CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
 YACCFLAGS = -d -t -v
 
-SUBDIRS=lib ip tc misc netem genl
+SUBDIRS=lib ip tc misc netem genl man
 
 LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
 LDLIBS += $(LIBNETLINK)

@@ -60,17 +60,6 @@ install: all
 		$(DESTDIR)$(DOCDIR)/examples/diffserv
 	@for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
 	install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
-	install -m 0755 -d $(DESTDIR)$(MANDIR)/man8
-	install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8
-	install -m 0755 -d $(DESTDIR)$(MANDIR)/man7
-	install -m 0644 $(shell find man/man7 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man7
-	ln -sf tc-bfifo.8  $(DESTDIR)$(MANDIR)/man8/tc-pfifo.8
-	ln -sf lnstat.8  $(DESTDIR)$(MANDIR)/man8/rtstat.8
-	ln -sf lnstat.8  $(DESTDIR)$(MANDIR)/man8/ctstat.8
-	ln -sf rtacct.8  $(DESTDIR)$(MANDIR)/man8/nstat.8
-	ln -sf routel.8  $(DESTDIR)$(MANDIR)/man8/routef.8
-	install -m 0755 -d $(DESTDIR)$(MANDIR)/man3
-	install -m 0644 $(shell find man/man3 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man3
 
 snapshot:
 	echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \

man/Makefile new file +20 -0

new file mode 100644
index 0000000..67fea05
@@ -0,0 +1,20 @@
+INSTALL=install
+INSTALLDIR=install -m 0755 -d
+INSTALLMAN=install -m 0644
+
+SUBDIRS = man3 man8
+
+all:
+	@for subdir in $(SUBDIRS); do $(MAKE) -C $$subdir; done
+
+distclean: clean
+
+clean:
+	@for subdir in $(SUBDIRS); do $(MAKE) -C $$subdir clean; done
+
+install:
+	@for subdir in $(SUBDIRS); do $(MAKE) -C $$subdir install; done
+
+.PHONY: install clean distclean
+
+.EXPORT_ALL_VARIABLES:

man/man3/Makefile new file +13 -0

new file mode 100644
index 0000000..bf55658
@@ -0,0 +1,13 @@
+MAN3PAGES=libnetlink.3
+
+all:
+
+distclean: clean
+
+clean:
+
+install:
+	$(INSTALLDIR) $(DESTDIR)$(MANDIR)/man3
+	$(INSTALLMAN) $(MAN3PAGES) $(DESTDIR)$(MANDIR)/man3
+
+.PHONY: install clean distclean

man/man8/Makefile new file +29 -0

new file mode 100644
index 0000000..ade1d17
@@ -0,0 +1,29 @@
+TARGETS = ip-address.8 ip-link.8 ip-route.8
+
+MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnstat.8 routel.8 rtacct.8 rtmon.8 ss.8 \
+	tc-bfifo.8 tc-cbq-details.8 tc-cbq.8 tc-drr.8 tc-htb.8 \
+	tc-pfifo.8 tc-pfifo_fast.8 tc-prio.8 tc-red.8 tc-sfq.8 \
+	tc-tbf.8 tc.8 rtstat.8 ctstat.8 nstat.8 routef.8
+
+all: $(TARGETS)
+
+ip-address.8: ip-address.8.in
+	sed "s|@SYSCONFDIR@|$(CONFDIR)|g" $< > $@
+
+ip-link.8: ip-link.8.in
+	sed "s|@SYSCONFDIR@|$(CONFDIR)|g" $< > $@
+
+ip-route.8: ip-route.8.in
+	sed "s|@SYSCONFDIR@|$(CONFDIR)|g" $< > $@
+
+distclean: clean
+
+clean:
+	@rm -f $(TARGETS)
+
+install:
+	$(INSTALLDIR) $(DESTDIR)$(MANDIR)/man8
+	$(INSTALLMAN) $(MAN8PAGES) $(DESTDIR)$(MANDIR)/man8
+
+.PHONY: install clean distclean
+

man/man8/ctstat.8 new file +1 -0

new file mode 100644
index 0000000..080e2b2
@@ -0,0 +1 @@
+.so man8/lnstat.8

man/man8/ip-address.8.in new file +240 -0

240 lines not on this page · raw message

man/man8/ip-link.8.in new file +374 -0

374 lines not on this page · raw message

man/man8/ip-route.8.in new file +744 -0

744 lines not on this page · raw message

man/man8/nstat.8 new file +1 -0

new file mode 100644
index 0000000..c703cc8
@@ -0,0 +1 @@
+.so man8/rtacct.8

man/man8/routef.8 new file +1 -0

new file mode 100644
index 0000000..c2a7059
@@ -0,0 +1 @@
+.so man8/routel.8

man/man8/rtstat.8 new file +1 -0

new file mode 100644
index 0000000..080e2b2
@@ -0,0 +1 @@
+.so man8/lnstat.8

man/man8/tc-pfifo.8 deleted +0 -1

deleted file mode 120000
index 70a54af..0000000
@@ -1 +0,0 @@
-tc-bfifo.8
\ No newline at end of file

man/man8/tc-pfifo.8 new file +1 -0

new file mode 100644
index 0000000..ed23850
@@ -0,0 +1 @@
+.so man8/tc-bfifo.8

Signature · 5 lines

1.7.4.4


-- 
Jabber: [email protected]