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-devel

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

[Xen-devel] [PATCH 5/6] makefiles - Add SBINDIR

from [Bastian Blank] [Permanent Link][Original]
To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 5/6] makefiles - Add SBINDIR
From: Bastian Blank <bastian@xxxxxxxxxxxx>
Date: Tue, 22 Jan 2008 14:27:11 +0100
Delivery-date: Tue, 22 Jan 2008 05:30:15 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.13 (2006-08-11) 
# HG changeset patch
# User Bastian Blank <waldi@xxxxxxxxxx>
# Date 1200745316 -3600
# Node ID 41f084a0999938d21310c185a9df2d0a5e69ad78
# Parent  cb78b5a0a34390592eb66590150bda0f3aaf2d1c
Add SBINDIR. Use it always.

Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>

diff -r cb78b5a0a343 -r 41f084a09999 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,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 cb78b5a0a343 -r 41f084a09999 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,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 cb78b5a0a343 -r 41f084a09999 tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile     Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/blktap/drivers/Makefile     Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/blktap/lib/Makefile Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/console/Makefile
--- a/tools/console/Makefile    Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/console/Makefile    Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/flask/loadpolicy/Makefile
--- a/tools/flask/loadpolicy/Makefile   Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/flask/loadpolicy/Makefile   Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/fs-back/Makefile
--- a/tools/fs-back/Makefile    Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/fs-back/Makefile    Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/misc/Makefile
--- a/tools/misc/Makefile       Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/misc/Makefile       Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/security/Makefile
--- a/tools/security/Makefile   Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/security/Makefile   Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/vnet/scripts/Makefile
--- a/tools/vnet/scripts/Makefile       Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/vnet/scripts/Makefile       Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/vnet/vnetd/Makefile
--- a/tools/vnet/vnetd/Makefile Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/vnet/vnetd/Makefile Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/xenmon/Makefile
--- a/tools/xenmon/Makefile     Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/xenmon/Makefile     Sat Jan 19 13:21:56 2008 +0100
@@ -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 cb78b5a0a343 -r 41f084a09999 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
@@ -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 cb78b5a0a343 -r 41f084a09999 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/xenstore/Makefile   Sat Jan 19 13:21:56 2008 +0100
@@ -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)

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH 5/6] makefiles - Add SBINDIR, Bastian Blank <=
Previous by Date:  [Xen-devel] [PATCH 4/6] makefiles - Add BINDIR, Bastian Blank
Next by Date:  [Xen-devel] [PATCH 6/6] makefiles - Add MANDIR, MAN1DIR and MAN8DIR, Bastian Blank
Previous by Thread:  [Xen-devel] [PATCH 4/6] makefiles - Add BINDIR, Bastian Blank
Next by Thread:  [Xen-devel] [PATCH 6/6] makefiles - Add MANDIR, MAN1DIR and MAN8DIR, Bastian Blank
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

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