diff options
| -rw-r--r-- | config/StdGNU.mk | 3 | ||||
| -rw-r--r-- | config/SunOS.mk | 3 | ||||
| -rw-r--r-- | tools/debugger/xenitp/Makefile | 10 | ||||
| -rw-r--r-- | tools/vnet/doc/Makefile | 8 | ||||
| -rw-r--r-- | tools/xenstat/xentop/Makefile | 8 | ||||
| -rw-r--r-- | tools/xentrace/Makefile | 10 |
6 files changed, 19 insertions, 23 deletions
diff --git a/config/StdGNU.mk b/config/StdGNU.mk index e0a29f7d0c..e1a8b6f6be 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -22,6 +22,9 @@ BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib LIBDIR_x86_64 = $(PREFIX)/lib64 +MANDIR = $(PREFIX)/share/man +MAN1DIR = $(MANDIR)/man1 +MAN8DIR = $(MANDIR)/man8 SBINDIR = $(PREFIX)/sbin SOCKET_LIBS = diff --git a/config/SunOS.mk b/config/SunOS.mk index ffa0a778f7..3992689f83 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -23,6 +23,9 @@ BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib LIBDIR_x86_64 = $(PREFIX)/lib/amd64 +MANDIR = $(PREFIX)/share/man +MAN1DIR = $(MANDIR)/man1 +MAN8DIR = $(MANDIR)/man8 SBINDIR = $(PREFIX)/sbin SunOS_LIBDIR = /usr/sfw/lib diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile index 94c61fde99..43049de85f 100644 --- a/tools/debugger/xenitp/Makefile +++ b/tools/debugger/xenitp/Makefile @@ -28,14 +28,12 @@ build: $(BIN) $(LIBBIN) install: build $(INSTALL_DIR) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin - [ -d $(DESTDIR)/usr/share/man/man1 ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 - [ -d $(DESTDIR)/usr/share/man/man8 ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 + $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) + $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin - $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 - $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 + $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) + $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) .PHONY: clean clean: diff --git a/tools/vnet/doc/Makefile b/tools/vnet/doc/Makefile index 38accfa7f6..a234721b51 100644 --- a/tools/vnet/doc/Makefile +++ b/tools/vnet/doc/Makefile @@ -13,8 +13,6 @@ LATEX2HTML := latex2html DOXYGEN := doxygen POD2MAN := pod2man -MAN_DIR := /usr/share/man - DOC_MAN5SRC := $(wildcard man/*.pod.5) DOC_MAN1SRC := $(wildcard man/*.pod.1) DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(DOC_MAN1SRC)) @@ -47,7 +45,7 @@ clean: .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(MAN_DIR) - $(CP) -dR man1 $(DESTDIR)$(MAN_DIR) - $(CP) -dR man5 $(DESTDIR)$(MAN_DIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(CP) -dR man1 $(DESTDIR)$(MANDIR) + $(CP) -dR man5 $(DESTDIR)$(MANDIR) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 479cee76e7..4b862a4ec5 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -18,10 +18,6 @@ ifneq ($(XENSTAT_XENTOP),y) all install xentop: else -prefix=/usr -mandir=$(prefix)/share/man -man1dir=$(mandir)/man1 - CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) LDFLAGS += -L$(XEN_LIBXENSTAT) LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) @@ -34,8 +30,8 @@ all: xentop install: xentop xentop.1 $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop - $(INSTALL_DIR) $(DESTDIR)$(man1dir) - $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1 + $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) + $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1 endif diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 5e46c90310..022f01e08a 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -37,14 +37,12 @@ build: $(BIN) $(LIBBIN) install: build $(INSTALL_DIR) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin - [ -d $(DESTDIR)/usr/share/man/man1 ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 - [ -d $(DESTDIR)/usr/share/man/man8 ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 + $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) + $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin - $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 - $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 + $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) + $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) .PHONY: clean clean: |