ia64/xen-unstable

changeset 16845:71012e36922c

Add SBINDIR. Use it always.

Signed-off-by: Bastian Blank <waldi@debian.org>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jan 22 14:35:02 2008 +0000 (2008-01-22)
parents 51a7e508bd01
children 0ededc85e6b4
files config/StdGNU.mk config/SunOS.mk tools/blktap/drivers/Makefile tools/blktap/lib/Makefile tools/console/Makefile tools/flask/loadpolicy/Makefile tools/fs-back/Makefile tools/misc/Makefile tools/security/Makefile tools/vnet/scripts/Makefile tools/vnet/vnetd/Makefile tools/xenmon/Makefile tools/xenstat/xentop/Makefile tools/xenstore/Makefile
line diff
     1.1 --- a/config/StdGNU.mk	Tue Jan 22 14:34:37 2008 +0000
     1.2 +++ b/config/StdGNU.mk	Tue Jan 22 14:35:02 2008 +0000
     1.3 @@ -22,6 +22,7 @@ BINDIR = $(PREFIX)/bin
     1.4  INCLUDEDIR = $(PREFIX)/include
     1.5  LIBDIR = $(PREFIX)/lib
     1.6  LIBDIR_x86_64 = $(PREFIX)/lib64
     1.7 +SBINDIR = $(PREFIX)/sbin
     1.8  
     1.9  SOCKET_LIBS =
    1.10  CURSES_LIBS = -lncurses
     2.1 --- a/config/SunOS.mk	Tue Jan 22 14:34:37 2008 +0000
     2.2 +++ b/config/SunOS.mk	Tue Jan 22 14:35:02 2008 +0000
     2.3 @@ -23,6 +23,7 @@ BINDIR = $(PREFIX)/bin
     2.4  INCLUDEDIR = $(PREFIX)/include
     2.5  LIBDIR = $(PREFIX)/lib
     2.6  LIBDIR_x86_64 = $(PREFIX)/lib/amd64
     2.7 +SBINDIR = $(PREFIX)/sbin
     2.8  
     2.9  SunOS_LIBDIR = /usr/sfw/lib
    2.10  SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
     3.1 --- a/tools/blktap/drivers/Makefile	Tue Jan 22 14:34:37 2008 +0000
     3.2 +++ b/tools/blktap/drivers/Makefile	Tue Jan 22 14:35:02 2008 +0000
     3.3 @@ -5,7 +5,6 @@ INCLUDES += -I.. -I../lib
     3.4  
     3.5  IBIN         = blktapctrl tapdisk
     3.6  QCOW_UTIL    = img2qcow qcow2raw qcow-create
     3.7 -INST_DIR     = /usr/sbin
     3.8  LIBAIO_DIR   = ../../libaio/src
     3.9  
    3.10  CFLAGS   += -Werror
    3.11 @@ -53,7 +52,7 @@ img2qcow qcow2raw qcow-create: %: $(BLK-
    3.12  	$(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
    3.13  
    3.14  install: all
    3.15 -	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
    3.16 +	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR)
    3.17  
    3.18  clean:
    3.19  	rm -rf *.o *~ $(DEPS) xen TAGS $(IBIN) $(LIB) $(QCOW_UTIL) $(VHD_UTIL)
     4.1 --- a/tools/blktap/lib/Makefile	Tue Jan 22 14:34:37 2008 +0000
     4.2 +++ b/tools/blktap/lib/Makefile	Tue Jan 22 14:35:02 2008 +0000
     4.3 @@ -5,8 +5,6 @@ MAJOR    = 3.0
     4.4  MINOR    = 0
     4.5  SONAME   = libblktap.so.$(MAJOR)
     4.6  
     4.7 -BLKTAP_INSTALL_DIR = /usr/sbin
     4.8 -
     4.9  INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
    4.10  
    4.11  LIBS     := -lz
     5.1 --- a/tools/console/Makefile	Tue Jan 22 14:34:37 2008 +0000
     5.2 +++ b/tools/console/Makefile	Tue Jan 22 14:35:02 2008 +0000
     5.3 @@ -2,7 +2,6 @@
     5.4  XEN_ROOT=../..
     5.5  include $(XEN_ROOT)/tools/Rules.mk
     5.6  
     5.7 -DAEMON_INSTALL_DIR = /usr/sbin
     5.8  CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
     5.9  
    5.10  CFLAGS  += -Werror
    5.11 @@ -30,7 +29,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcar
    5.12  
    5.13  .PHONY: install
    5.14  install: $(BIN)
    5.15 -	$(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
    5.16 -	$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
    5.17 +	$(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
    5.18 +	$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
    5.19  	$(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
    5.20  	$(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
     6.1 --- a/tools/flask/loadpolicy/Makefile	Tue Jan 22 14:34:37 2008 +0000
     6.2 +++ b/tools/flask/loadpolicy/Makefile	Tue Jan 22 14:35:02 2008 +0000
     6.3 @@ -51,8 +51,8 @@ print-end:
     6.4  
     6.5  .PHONY: install
     6.6  install: all
     6.7 -	$(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
     6.8 -	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/sbin
     6.9 +	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
    6.10 +	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(SBINDIR)
    6.11  
    6.12  -include $(PROG_DEP)
    6.13  
     7.1 --- a/tools/fs-back/Makefile	Tue Jan 22 14:34:37 2008 +0000
     7.2 +++ b/tools/fs-back/Makefile	Tue Jan 22 14:35:02 2008 +0000
     7.3 @@ -4,7 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
     7.4  INCLUDES += -I.. -I../lib
     7.5  
     7.6  IBIN         = fs-backend 
     7.7 -INST_DIR     = /usr/sbin
     7.8  
     7.9  CFLAGS   += -Werror
    7.10  CFLAGS   += -Wno-unused
    7.11 @@ -30,7 +29,7 @@ fs-backend: $(OBJS) fs-backend.c
    7.12  	$(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
    7.13  
    7.14  install: all
    7.15 -	$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
    7.16 +	$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
    7.17  
    7.18  clean:
    7.19  	rm -rf *.o *~ $(DEPS) xen $(IBIN) $(LIB)
     8.1 --- a/tools/misc/Makefile	Tue Jan 22 14:34:37 2008 +0000
     8.2 +++ b/tools/misc/Makefile	Tue Jan 22 14:35:02 2008 +0000
     8.3 @@ -30,9 +30,9 @@ build: $(TARGETS)
     8.4  .PHONY: install
     8.5  install: build
     8.6  	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
     8.7 -	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
     8.8 +	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
     8.9  	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
    8.10 -	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
    8.11 +	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
    8.12  	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
    8.13  
    8.14  .PHONY: clean
     9.1 --- a/tools/security/Makefile	Tue Jan 22 14:34:37 2008 +0000
     9.2 +++ b/tools/security/Makefile	Tue Jan 22 14:35:02 2008 +0000
     9.3 @@ -44,9 +44,9 @@ ifndef XEN_PYTHON_NATIVE_INSTALL
     9.4  install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
     9.5  endif
     9.6  install: all $(ACM_CONFIG_FILE)
     9.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
     9.8 -	$(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)/usr/sbin
     9.9 -	$(INSTALL_PROG) $(ACM_EZPOLICY) $(DESTDIR)/usr/sbin
    9.10 +	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
    9.11 +	$(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)$(SBINDIR)
    9.12 +	$(INSTALL_PROG) $(ACM_EZPOLICY) $(DESTDIR)$(SBINDIR)
    9.13  	$(INSTALL_DIR) $(DESTDIR)$(ACM_CONFIG_DIR)
    9.14  	$(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)
    9.15  	$(INSTALL_DATA) policies/$(ACM_SCHEMA) $(DESTDIR)$(ACM_POLICY_DIR)
    10.1 --- a/tools/vnet/scripts/Makefile	Tue Jan 22 14:34:37 2008 +0000
    10.2 +++ b/tools/vnet/scripts/Makefile	Tue Jan 22 14:35:02 2008 +0000
    10.3 @@ -3,15 +3,13 @@
    10.4  XEN_ROOT        = ../../..
    10.5  include $(XEN_ROOT)/tools/Rules.mk
    10.6  
    10.7 -SBIN_DIR        = $(DESTDIR)/usr/sbin
    10.8 -
    10.9  .PHONY: all
   10.10  all:
   10.11  
   10.12  .PHONY: install
   10.13  install:
   10.14 -	$(INSTALL_DIR) $(SBIN_DIR)
   10.15 -	$(INSTALL_PROG) vn $(SBIN_DIR)
   10.16 +	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
   10.17 +	$(INSTALL_PROG) vn $(DESTDIR)$(SBINDIR)
   10.18  
   10.19  .PHONY: clean
   10.20  clean:
    11.1 --- a/tools/vnet/vnetd/Makefile	Tue Jan 22 14:34:37 2008 +0000
    11.2 +++ b/tools/vnet/vnetd/Makefile	Tue Jan 22 14:35:02 2008 +0000
    11.3 @@ -29,8 +29,6 @@ all: vnetd
    11.4  
    11.5  INSTALL_PROG ?= $(INSTALL) -m0755 -p
    11.6  
    11.7 -VNETD_INSTALL_DIR = /usr/sbin
    11.8 -
    11.9  INCLUDES += -I$(LIBXUTIL_DIR)
   11.10  INCLUDES += -I$(VNET_MODULE_DIR)
   11.11  INCLUDES += -I$(shell pwd)
   11.12 @@ -111,8 +109,8 @@ vnetd: $(VNETD_OBJ)
   11.13  
   11.14  .PHONY: install
   11.15  install: vnetd
   11.16 -	mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)
   11.17 -	$(INSTALL_PROG) vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)
   11.18 +	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
   11.19 +	$(INSTALL_PROG) vnetd $(DESTDIR)$(SBINDIR)
   11.20  
   11.21  .PHONY: clean
   11.22  clean:
    12.1 --- a/tools/xenmon/Makefile	Tue Jan 22 14:34:37 2008 +0000
    12.2 +++ b/tools/xenmon/Makefile	Tue Jan 22 14:35:02 2008 +0000
    12.3 @@ -13,8 +13,6 @@
    12.4  XEN_ROOT=../..
    12.5  include $(XEN_ROOT)/tools/Rules.mk
    12.6  
    12.7 -sbindir=/usr/sbin
    12.8 -
    12.9  CFLAGS  += -Werror
   12.10  CFLAGS  += -I $(XEN_XC)
   12.11  CFLAGS  += -I $(XEN_LIBXC)
   12.12 @@ -31,10 +29,10 @@ build: $(BIN)
   12.13  
   12.14  .PHONY: install
   12.15  install: build
   12.16 -	[ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir)
   12.17 -	$(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
   12.18 -	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(sbindir)/xentrace_setmask
   12.19 -	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(sbindir)/xenmon.py
   12.20 +	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
   12.21 +	$(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked
   12.22 +	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(SBINDIR)/xentrace_setmask
   12.23 +	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(SBINDIR)/xenmon.py
   12.24  
   12.25  .PHONY: clean
   12.26  clean:
    13.1 --- a/tools/xenstat/xentop/Makefile	Tue Jan 22 14:34:37 2008 +0000
    13.2 +++ b/tools/xenstat/xentop/Makefile	Tue Jan 22 14:35:02 2008 +0000
    13.3 @@ -21,7 +21,6 @@ else
    13.4  prefix=/usr
    13.5  mandir=$(prefix)/share/man
    13.6  man1dir=$(mandir)/man1
    13.7 -sbindir=$(prefix)/sbin
    13.8  
    13.9  CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
   13.10  LDFLAGS += -L$(XEN_LIBXENSTAT)
   13.11 @@ -33,7 +32,8 @@ all: xentop
   13.12  
   13.13  .PHONY: install
   13.14  install: xentop xentop.1
   13.15 -	$(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
   13.16 +	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
   13.17 +	$(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop
   13.18  	$(INSTALL_DIR) $(DESTDIR)$(man1dir)
   13.19  	$(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
   13.20  
    14.1 --- a/tools/xenstore/Makefile	Tue Jan 22 14:34:37 2008 +0000
    14.2 +++ b/tools/xenstore/Makefile	Tue Jan 22 14:35:02 2008 +0000
    14.3 @@ -82,9 +82,9 @@ install: all
    14.4  	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
    14.5  	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
    14.6  	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
    14.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
    14.8 +	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
    14.9  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
   14.10 -	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
   14.11 +	$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
   14.12  	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(BINDIR)
   14.13  	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
   14.14  	$(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR)