Bastian Blank
2008-Jan-22 13:27 UTC
[Xen-devel] [PATCH 6/6] makefiles - Add MANDIR, MAN1DIR and MAN8DIR
# HG changeset patch # User Bastian Blank <waldi@debian.org> # Date 1200745316 -3600 # Node ID 42fca43eee53d9e594f36f14919082ad3fcdeadb # Parent 41f084a0999938d21310c185a9df2d0a5e69ad78 Add MANDIR, MAN1DIR and MAN8DIR. Use it. Signed-off-by: Bastian Blank <waldi@debian.org> diff -r 41f084a09999 -r 42fca43eee53 config/StdGNU.mk --- a/config/StdGNU.mk Sat Jan 19 13:21:56 2008 +0100 +++ b/config/StdGNU.mk Sat Jan 19 13:21:56 2008 +0100 @@ -22,6 +22,9 @@ INCLUDEDIR = $(PREFIX)/include 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 -r 41f084a09999 -r 42fca43eee53 config/SunOS.mk --- a/config/SunOS.mk Sat Jan 19 13:21:56 2008 +0100 +++ b/config/SunOS.mk Sat Jan 19 13:21:56 2008 +0100 @@ -23,6 +23,9 @@ INCLUDEDIR = $(PREFIX)/include 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 -r 41f084a09999 -r 42fca43eee53 tools/debugger/xenitp/Makefile --- a/tools/debugger/xenitp/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/debugger/xenitp/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -28,14 +28,12 @@ install: build 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 -r 41f084a09999 -r 42fca43eee53 tools/vnet/doc/Makefile --- a/tools/vnet/doc/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/vnet/doc/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -12,8 +12,6 @@ LATEX2HTML := latex2html LATEX2HTML := latex2html DOXYGEN := doxygen POD2MAN := pod2man - -MAN_DIR := /usr/share/man DOC_MAN5SRC := $(wildcard man/*.pod.5) DOC_MAN1SRC := $(wildcard man/*.pod.1) @@ -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 -r 41f084a09999 -r 42fca43eee53 tools/xenstat/xentop/Makefile --- a/tools/xenstat/xentop/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/xenstat/xentop/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -18,10 +18,6 @@ all install xentop: 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 @@ install: xentop xentop.1 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 -r 41f084a09999 -r 42fca43eee53 tools/xentrace/Makefile --- a/tools/xentrace/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/xentrace/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -37,14 +37,12 @@ install: build 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: _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel