debuggers.hg
changeset 16829:0ededc85e6b4
Add MANDIR, MAN1DIR and MAN8DIR. Use it.
Signed-off-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Bastian Blank <waldi@debian.org>
| author | Keir Fraser <keir.fraser@citrix.com> |
|---|---|
| date | Tue Jan 22 14:35:17 2008 +0000 (2008-01-22) |
| parents | 71012e36922c |
| children | a878752a83f9 603ea719d73a |
| files | config/StdGNU.mk config/SunOS.mk tools/debugger/xenitp/Makefile tools/vnet/doc/Makefile tools/xenstat/xentop/Makefile tools/xentrace/Makefile |
line diff
1.1 --- a/config/StdGNU.mk Tue Jan 22 14:35:02 2008 +0000 1.2 +++ b/config/StdGNU.mk Tue Jan 22 14:35:17 2008 +0000 1.3 @@ -22,6 +22,9 @@ BINDIR = $(PREFIX)/bin 1.4 INCLUDEDIR = $(PREFIX)/include 1.5 LIBDIR = $(PREFIX)/lib 1.6 LIBDIR_x86_64 = $(PREFIX)/lib64 1.7 +MANDIR = $(PREFIX)/share/man 1.8 +MAN1DIR = $(MANDIR)/man1 1.9 +MAN8DIR = $(MANDIR)/man8 1.10 SBINDIR = $(PREFIX)/sbin 1.11 1.12 SOCKET_LIBS =
2.1 --- a/config/SunOS.mk Tue Jan 22 14:35:02 2008 +0000 2.2 +++ b/config/SunOS.mk Tue Jan 22 14:35:17 2008 +0000 2.3 @@ -23,6 +23,9 @@ BINDIR = $(PREFIX)/bin 2.4 INCLUDEDIR = $(PREFIX)/include 2.5 LIBDIR = $(PREFIX)/lib 2.6 LIBDIR_x86_64 = $(PREFIX)/lib/amd64 2.7 +MANDIR = $(PREFIX)/share/man 2.8 +MAN1DIR = $(MANDIR)/man1 2.9 +MAN8DIR = $(MANDIR)/man8 2.10 SBINDIR = $(PREFIX)/sbin 2.11 2.12 SunOS_LIBDIR = /usr/sfw/lib
3.1 --- a/tools/debugger/xenitp/Makefile Tue Jan 22 14:35:02 2008 +0000 3.2 +++ b/tools/debugger/xenitp/Makefile Tue Jan 22 14:35:17 2008 +0000 3.3 @@ -28,14 +28,12 @@ build: $(BIN) $(LIBBIN) 3.4 install: build 3.5 $(INSTALL_DIR) $(DESTDIR)$(BINDIR) 3.6 [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin 3.7 - [ -d $(DESTDIR)/usr/share/man/man1 ] || \ 3.8 - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 3.9 - [ -d $(DESTDIR)/usr/share/man/man8 ] || \ 3.10 - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 3.11 + $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) 3.12 + $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) 3.13 $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) 3.14 [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin 3.15 - $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 3.16 - $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 3.17 + $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) 3.18 + $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) 3.19 3.20 .PHONY: clean 3.21 clean:
4.1 --- a/tools/vnet/doc/Makefile Tue Jan 22 14:35:02 2008 +0000 4.2 +++ b/tools/vnet/doc/Makefile Tue Jan 22 14:35:17 2008 +0000 4.3 @@ -13,8 +13,6 @@ LATEX2HTML := latex2html 4.4 DOXYGEN := doxygen 4.5 POD2MAN := pod2man 4.6 4.7 -MAN_DIR := /usr/share/man 4.8 - 4.9 DOC_MAN5SRC := $(wildcard man/*.pod.5) 4.10 DOC_MAN1SRC := $(wildcard man/*.pod.1) 4.11 DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(DOC_MAN1SRC)) 4.12 @@ -47,7 +45,7 @@ clean: 4.13 4.14 .PHONY: install 4.15 install: all 4.16 - $(INSTALL_DIR) $(DESTDIR)$(MAN_DIR) 4.17 - $(CP) -dR man1 $(DESTDIR)$(MAN_DIR) 4.18 - $(CP) -dR man5 $(DESTDIR)$(MAN_DIR) 4.19 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) 4.20 + $(CP) -dR man1 $(DESTDIR)$(MANDIR) 4.21 + $(CP) -dR man5 $(DESTDIR)$(MANDIR) 4.22
5.1 --- a/tools/xenstat/xentop/Makefile Tue Jan 22 14:35:02 2008 +0000 5.2 +++ b/tools/xenstat/xentop/Makefile Tue Jan 22 14:35:17 2008 +0000 5.3 @@ -18,10 +18,6 @@ ifneq ($(XENSTAT_XENTOP),y) 5.4 all install xentop: 5.5 else 5.6 5.7 -prefix=/usr 5.8 -mandir=$(prefix)/share/man 5.9 -man1dir=$(mandir)/man1 5.10 - 5.11 CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) 5.12 LDFLAGS += -L$(XEN_LIBXENSTAT) 5.13 LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) 5.14 @@ -34,8 +30,8 @@ all: xentop 5.15 install: xentop xentop.1 5.16 $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) 5.17 $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop 5.18 - $(INSTALL_DIR) $(DESTDIR)$(man1dir) 5.19 - $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1 5.20 + $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) 5.21 + $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1 5.22 5.23 endif 5.24
6.1 --- a/tools/xentrace/Makefile Tue Jan 22 14:35:02 2008 +0000 6.2 +++ b/tools/xentrace/Makefile Tue Jan 22 14:35:17 2008 +0000 6.3 @@ -37,14 +37,12 @@ build: $(BIN) $(LIBBIN) 6.4 install: build 6.5 $(INSTALL_DIR) $(DESTDIR)$(BINDIR) 6.6 [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin 6.7 - [ -d $(DESTDIR)/usr/share/man/man1 ] || \ 6.8 - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 6.9 - [ -d $(DESTDIR)/usr/share/man/man8 ] || \ 6.10 - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 6.11 + $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) 6.12 + $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) 6.13 $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) 6.14 [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin 6.15 - $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 6.16 - $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 6.17 + $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) 6.18 + $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) 6.19 6.20 .PHONY: clean 6.21 clean: