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

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[Xen-changelog] [xen-unstable] Add SBINDIR. Use it always.

from [Xen patchbot-unstable] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Add SBINDIR. Use it always.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 23 Jan 2008 01:10:27 -0800
Delivery-date: Wed, 23 Jan 2008 01:12:37 -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 1201012502 0
# Node ID 71012e36922cfb4c9d988935605b9b55ea4540a8
# Parent  51a7e508bd01a1a7d083eada58062aa7b08b839b
Add SBINDIR. Use it always.

Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
 config/StdGNU.mk                |    1 +
 config/SunOS.mk                 |    1 +
 tools/blktap/drivers/Makefile   |    3 +--
 tools/blktap/lib/Makefile       |    2 --
 tools/console/Makefile          |    5 ++---
 tools/flask/loadpolicy/Makefile |    4 ++--
 tools/fs-back/Makefile          |    3 +--
 tools/misc/Makefile             |    4 ++--
 tools/security/Makefile         |    6 +++---
 tools/vnet/scripts/Makefile     |    6 ++----
 tools/vnet/vnetd/Makefile       |    6 ++----
 tools/xenmon/Makefile           |   10 ++++------
 tools/xenstat/xentop/Makefile   |    4 ++--
 tools/xenstore/Makefile         |    4 ++--
 14 files changed, 25 insertions(+), 34 deletions(-)

diff -r 51a7e508bd01 -r 71012e36922c config/StdGNU.mk
--- a/config/StdGNU.mk  Tue Jan 22 14:34:37 2008 +0000
+++ b/config/StdGNU.mk  Tue Jan 22 14:35:02 2008 +0000
@@ -22,6 +22,7 @@ INCLUDEDIR = $(PREFIX)/include
 INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib64
+SBINDIR = $(PREFIX)/sbin
 
 SOCKET_LIBS =
 CURSES_LIBS = -lncurses
diff -r 51a7e508bd01 -r 71012e36922c config/SunOS.mk
--- a/config/SunOS.mk   Tue Jan 22 14:34:37 2008 +0000
+++ b/config/SunOS.mk   Tue Jan 22 14:35:02 2008 +0000
@@ -23,6 +23,7 @@ INCLUDEDIR = $(PREFIX)/include
 INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib/amd64
+SBINDIR = $(PREFIX)/sbin
 
 SunOS_LIBDIR = /usr/sfw/lib
 SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
diff -r 51a7e508bd01 -r 71012e36922c tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile     Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/blktap/drivers/Makefile     Tue Jan 22 14:35:02 2008 +0000
@@ -5,7 +5,6 @@ INCLUDES += -I.. -I../lib
 
 IBIN         = blktapctrl tapdisk
 QCOW_UTIL    = img2qcow qcow2raw qcow-create
-INST_DIR     = /usr/sbin
 LIBAIO_DIR   = ../../libaio/src
 
 CFLAGS   += -Werror
@@ -53,7 +52,7 @@ img2qcow qcow2raw qcow-create: %: $(BLK-
        $(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
 
 install: all
-       $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
+       $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR)
 
 clean:
        rm -rf *.o *~ $(DEPS) xen TAGS $(IBIN) $(LIB) $(QCOW_UTIL) $(VHD_UTIL)
diff -r 51a7e508bd01 -r 71012e36922c tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/blktap/lib/Makefile Tue Jan 22 14:35:02 2008 +0000
@@ -4,8 +4,6 @@ MAJOR    = 3.0
 MAJOR    = 3.0
 MINOR    = 0
 SONAME   = libblktap.so.$(MAJOR)
-
-BLKTAP_INSTALL_DIR = /usr/sbin
 
 INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
 
diff -r 51a7e508bd01 -r 71012e36922c tools/console/Makefile
--- a/tools/console/Makefile    Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/console/Makefile    Tue Jan 22 14:35:02 2008 +0000
@@ -2,7 +2,6 @@ XEN_ROOT=../..
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-DAEMON_INSTALL_DIR = /usr/sbin
 CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
 
 CFLAGS  += -Werror
@@ -30,7 +29,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcar
 
 .PHONY: install
 install: $(BIN)
-       $(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
-       $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
+       $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
        $(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
        $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
diff -r 51a7e508bd01 -r 71012e36922c tools/flask/loadpolicy/Makefile
--- a/tools/flask/loadpolicy/Makefile   Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/flask/loadpolicy/Makefile   Tue Jan 22 14:35:02 2008 +0000
@@ -51,8 +51,8 @@ print-end:
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(SBINDIR)
 
 -include $(PROG_DEP)
 
diff -r 51a7e508bd01 -r 71012e36922c tools/fs-back/Makefile
--- a/tools/fs-back/Makefile    Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/fs-back/Makefile    Tue Jan 22 14:35:02 2008 +0000
@@ -4,7 +4,6 @@ INCLUDES += -I.. -I../lib
 INCLUDES += -I.. -I../lib
 
 IBIN         = fs-backend 
-INST_DIR     = /usr/sbin
 
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
@@ -30,7 +29,7 @@ fs-backend: $(OBJS) fs-backend.c
        $(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
 
 install: all
-       $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
+       $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
 
 clean:
        rm -rf *.o *~ $(DEPS) xen $(IBIN) $(LIB)
diff -r 51a7e508bd01 -r 71012e36922c tools/misc/Makefile
--- a/tools/misc/Makefile       Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/misc/Makefile       Tue Jan 22 14:35:02 2008 +0000
@@ -30,9 +30,9 @@ build: $(TARGETS)
 .PHONY: install
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
        $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
-       $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
+       $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
 
 .PHONY: clean
diff -r 51a7e508bd01 -r 71012e36922c tools/security/Makefile
--- a/tools/security/Makefile   Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/security/Makefile   Tue Jan 22 14:35:02 2008 +0000
@@ -44,9 +44,9 @@ install: LIBPATH=$(shell PYTHONPATH=../p
 install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import 
auxbin; print auxbin.libpath()")
 endif
 install: all $(ACM_CONFIG_FILE)
-       $(INSTALL_DIR) $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) $(ACM_EZPOLICY) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) $(ACM_EZPOLICY) $(DESTDIR)$(SBINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(ACM_CONFIG_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)
        $(INSTALL_DATA) policies/$(ACM_SCHEMA) $(DESTDIR)$(ACM_POLICY_DIR)
diff -r 51a7e508bd01 -r 71012e36922c tools/vnet/scripts/Makefile
--- a/tools/vnet/scripts/Makefile       Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/vnet/scripts/Makefile       Tue Jan 22 14:35:02 2008 +0000
@@ -2,16 +2,14 @@
 #============================================================================
 XEN_ROOT        = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
-
-SBIN_DIR        = $(DESTDIR)/usr/sbin
 
 .PHONY: all
 all:
 
 .PHONY: install
 install:
-       $(INSTALL_DIR) $(SBIN_DIR)
-       $(INSTALL_PROG) vn $(SBIN_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) vn $(DESTDIR)$(SBINDIR)
 
 .PHONY: clean
 clean:
diff -r 51a7e508bd01 -r 71012e36922c tools/vnet/vnetd/Makefile
--- a/tools/vnet/vnetd/Makefile Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/vnet/vnetd/Makefile Tue Jan 22 14:35:02 2008 +0000
@@ -28,8 +28,6 @@ all: vnetd
 #include $(XEN_ROOT)/tools/Rules.mk
 
 INSTALL_PROG ?= $(INSTALL) -m0755 -p
-
-VNETD_INSTALL_DIR = /usr/sbin
 
 INCLUDES += -I$(LIBXUTIL_DIR)
 INCLUDES += -I$(VNET_MODULE_DIR)
@@ -111,8 +109,8 @@ vnetd: $(VNETD_OBJ)
 
 .PHONY: install
 install: vnetd
-       mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)
-       $(INSTALL_PROG) vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) vnetd $(DESTDIR)$(SBINDIR)
 
 .PHONY: clean
 clean:
diff -r 51a7e508bd01 -r 71012e36922c tools/xenmon/Makefile
--- a/tools/xenmon/Makefile     Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/xenmon/Makefile     Tue Jan 22 14:35:02 2008 +0000
@@ -12,8 +12,6 @@
 
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
-
-sbindir=/usr/sbin
 
 CFLAGS  += -Werror
 CFLAGS  += -I $(XEN_XC)
@@ -31,10 +29,10 @@ build: $(BIN)
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir)
-       $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
-       $(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(sbindir)/xentrace_setmask
-       $(INSTALL_PROG) xenmon.py  $(DESTDIR)$(sbindir)/xenmon.py
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked
+       $(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(SBINDIR)/xentrace_setmask
+       $(INSTALL_PROG) xenmon.py  $(DESTDIR)$(SBINDIR)/xenmon.py
 
 .PHONY: clean
 clean:
diff -r 51a7e508bd01 -r 71012e36922c tools/xenstat/xentop/Makefile
--- a/tools/xenstat/xentop/Makefile     Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/xenstat/xentop/Makefile     Tue Jan 22 14:35:02 2008 +0000
@@ -21,7 +21,6 @@ prefix=/usr
 prefix=/usr
 mandir=$(prefix)/share/man
 man1dir=$(mandir)/man1
-sbindir=$(prefix)/sbin
 
 CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
 LDFLAGS += -L$(XEN_LIBXENSTAT)
@@ -33,7 +32,8 @@ all: xentop
 
 .PHONY: install
 install: xentop xentop.1
-       $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop
        $(INSTALL_DIR) $(DESTDIR)$(man1dir)
        $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
 
diff -r 51a7e508bd01 -r 71012e36922c tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Tue Jan 22 14:34:37 2008 +0000
+++ b/tools/xenstore/Makefile   Tue Jan 22 14:35:02 2008 +0000
@@ -82,9 +82,9 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
        $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
+       $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
        $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(BINDIR)
        $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
        $(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] Add SBINDIR. Use it always., Xen patchbot-unstable <=
Previous by Date:  [Xen-changelog] [xen-unstable] Apply PREFIX directly to LIBDIR., Xen patchbot-unstable
Next by Date:  [Xen-changelog] [xen-unstable] x86_emulate: Provide callbacks for faster emulation of:, Xen patchbot-unstable
Previous by Thread:  [Xen-changelog] [xen-unstable] Apply PREFIX directly to LIBDIR., Xen patchbot-unstable
Next by Thread:  [Xen-changelog] [xen-unstable] x86_emulate: Provide callbacks for faster emulation of:, Xen patchbot-unstable
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy