WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Add MANDIR, MAN1DIR and MAN8DIR. Use it.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Add MANDIR, MAN1DIR and MAN8DIR. Use it.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 23 Jan 2008 01:10:28 -0800
Delivery-date: Wed, 23 Jan 2008 01:12:22 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201012517 0
# Node ID 0ededc85e6b4f4887e37575794e529043a2612be
# Parent  71012e36922cfb4c9d988935605b9b55ea4540a8
Add MANDIR, MAN1DIR and MAN8DIR. Use it.

Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
 config/StdGNU.mk               |    3 +++
 config/SunOS.mk                |    3 +++
 tools/debugger/xenitp/Makefile |   10 ++++------
 tools/vnet/doc/Makefile        |    8 +++-----
 tools/xenstat/xentop/Makefile  |    8 ++------
 tools/xentrace/Makefile        |   10 ++++------
 6 files changed, 19 insertions(+), 23 deletions(-)

diff -r 71012e36922c -r 0ededc85e6b4 config/StdGNU.mk
--- a/config/StdGNU.mk  Tue Jan 22 14:35:02 2008 +0000
+++ b/config/StdGNU.mk  Tue Jan 22 14:35:17 2008 +0000
@@ -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 71012e36922c -r 0ededc85e6b4 config/SunOS.mk
--- a/config/SunOS.mk   Tue Jan 22 14:35:02 2008 +0000
+++ b/config/SunOS.mk   Tue Jan 22 14:35:17 2008 +0000
@@ -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 71012e36922c -r 0ededc85e6b4 tools/debugger/xenitp/Makefile
--- a/tools/debugger/xenitp/Makefile    Tue Jan 22 14:35:02 2008 +0000
+++ b/tools/debugger/xenitp/Makefile    Tue Jan 22 14:35:17 2008 +0000
@@ -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 71012e36922c -r 0ededc85e6b4 tools/vnet/doc/Makefile
--- a/tools/vnet/doc/Makefile   Tue Jan 22 14:35:02 2008 +0000
+++ b/tools/vnet/doc/Makefile   Tue Jan 22 14:35:17 2008 +0000
@@ -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 71012e36922c -r 0ededc85e6b4 tools/xenstat/xentop/Makefile
--- a/tools/xenstat/xentop/Makefile     Tue Jan 22 14:35:02 2008 +0000
+++ b/tools/xenstat/xentop/Makefile     Tue Jan 22 14:35:17 2008 +0000
@@ -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 71012e36922c -r 0ededc85e6b4 tools/xentrace/Makefile
--- a/tools/xentrace/Makefile   Tue Jan 22 14:35:02 2008 +0000
+++ b/tools/xentrace/Makefile   Tue Jan 22 14:35:17 2008 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] Add MANDIR, MAN1DIR and MAN8DIR. Use it., Xen patchbot-unstable <=