ia64/xen-unstable

changeset 16842:89995ccec15a

Add INCLUDEDIR. Use it.

Signed-off-by: Bastian Blank <waldi@debian.org>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jan 22 14:30:21 2008 +0000 (2008-01-22)
parents 6ed9b42d1ec4
children 5e03f0bc0aa2
files config/StdGNU.mk config/SunOS.mk tools/blktap/lib/Makefile tools/flask/libflask/Makefile tools/guest-headers/Makefile tools/libfsimage/common/Makefile tools/libxc/Makefile tools/libxen/Makefile tools/libxen/Makefile.dist tools/xenstore/Makefile
line diff
     1.1 --- a/config/StdGNU.mk	Tue Jan 22 14:29:11 2008 +0000
     1.2 +++ b/config/StdGNU.mk	Tue Jan 22 14:30:21 2008 +0000
     1.3 @@ -18,6 +18,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
     1.4  INSTALL_PROG = $(INSTALL) -m0755 -p
     1.5  
     1.6  PREFIX ?= /usr
     1.7 +INCLUDEDIR = $(PREFIX)/include
     1.8  LIBDIR = $(PREFIX)/lib
     1.9  LIBDIR_x86_64 = $(PREFIX)/lib64
    1.10  
     2.1 --- a/config/SunOS.mk	Tue Jan 22 14:29:11 2008 +0000
     2.2 +++ b/config/SunOS.mk	Tue Jan 22 14:30:21 2008 +0000
     2.3 @@ -19,6 +19,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
     2.4  INSTALL_PROG = $(INSTALL) -m0755 -p
     2.5  
     2.6  PREFIX ?= /usr
     2.7 +INCLUDEDIR = $(PREFIX)/include
     2.8  LIBDIR = $(PREFIX)/lib
     2.9  LIBDIR_x86_64 = $(PREFIX)/lib/amd64
    2.10  
     3.1 --- a/tools/blktap/lib/Makefile	Tue Jan 22 14:29:11 2008 +0000
     3.2 +++ b/tools/blktap/lib/Makefile	Tue Jan 22 14:30:21 2008 +0000
     3.3 @@ -41,11 +41,11 @@ libblktap: libblktap.a
     3.4  
     3.5  install: all
     3.6  	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
     3.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/include
     3.8 +	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
     3.9  	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
    3.10  	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
    3.11  	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
    3.12 -	$(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
    3.13 +	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
    3.14  
    3.15  clean:
    3.16  	rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
     4.1 --- a/tools/flask/libflask/Makefile	Tue Jan 22 14:29:11 2008 +0000
     4.2 +++ b/tools/flask/libflask/Makefile	Tue Jan 22 14:30:21 2008 +0000
     4.3 @@ -34,12 +34,12 @@ build:
     4.4  .PHONY: install
     4.5  install: build
     4.6  	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
     4.7 -	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
     4.8 +	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
     4.9  	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
    4.10  	$(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
    4.11  	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
    4.12  	ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
    4.13 -	$(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
    4.14 +	$(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
    4.15  
    4.16  .PHONY: TAGS
    4.17  TAGS:
     5.1 --- a/tools/guest-headers/Makefile	Tue Jan 22 14:29:11 2008 +0000
     5.2 +++ b/tools/guest-headers/Makefile	Tue Jan 22 14:30:21 2008 +0000
     5.3 @@ -10,8 +10,8 @@ check:
     5.4  .PHONY: install
     5.5  
     5.6  install:
     5.7 -	mkdir -p $(DESTDIR)/usr/include/xen/sys
     5.8 -	$(INSTALL_DATA) $(XEN_ROOT)/tools/include/$(XEN_OS)/*.h $(DESTDIR)/usr/include/xen/sys
     5.9 +	mkdir -p $(DESTDIR)$(INCLUDEDIR)/xen/sys
    5.10 +	$(INSTALL_DATA) $(XEN_ROOT)/tools/include/$(XEN_OS)/*.h $(DESTDIR)$(INCLUDEDIR)/xen/sys
    5.11  
    5.12  .PHONY: clean
    5.13  clean:
     6.1 --- a/tools/libfsimage/common/Makefile	Tue Jan 22 14:29:11 2008 +0000
     6.2 +++ b/tools/libfsimage/common/Makefile	Tue Jan 22 14:30:21 2008 +0000
     6.3 @@ -23,13 +23,13 @@ all: $(LIB)
     6.4  .PHONY: install
     6.5  install: all
     6.6  	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
     6.7 -	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
     6.8 +	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
     6.9  	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
    6.10  	ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
    6.11  	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
    6.12 -	$(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
    6.13 -	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
    6.14 -	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
    6.15 +	$(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
    6.16 +	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
    6.17 +	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
    6.18  
    6.19  clean distclean:
    6.20  	rm -f $(PIC_OBJS) $(LIB) $(DEPS)
     7.1 --- a/tools/libxc/Makefile	Tue Jan 22 14:29:11 2008 +0000
     7.2 +++ b/tools/libxc/Makefile	Tue Jan 22 14:30:21 2008 +0000
     7.3 @@ -104,18 +104,18 @@ check-for-zlib:
     7.4  .PHONY: install
     7.5  install: build
     7.6  	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
     7.7 -	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
     7.8 +	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
     7.9  	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
    7.10  	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
    7.11  	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
    7.12  	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
    7.13 -	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
    7.14 +	$(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR)
    7.15  
    7.16  	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
    7.17  	$(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
    7.18  	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
    7.19  	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
    7.20 -	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
    7.21 +	$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
    7.22  
    7.23  .PHONY: TAGS
    7.24  TAGS:
     8.1 --- a/tools/libxen/Makefile	Tue Jan 22 14:29:11 2008 +0000
     8.2 +++ b/tools/libxen/Makefile	Tue Jan 22 14:30:21 2008 +0000
     8.3 @@ -55,14 +55,14 @@ libxenapi.a: $(LIBXENAPI_OBJS)
     8.4  
     8.5  .PHONY: install
     8.6  install: all
     8.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
     8.8 +	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api
     8.9  	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
    8.10  	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
    8.11  	ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
    8.12  	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
    8.13  	$(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
    8.14  	set -e; for i in $(LIBXENAPI_HDRS); do \
    8.15 -	    $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
    8.16 +	    $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \
    8.17  	done
    8.18  
    8.19  
     9.1 --- a/tools/libxen/Makefile.dist	Tue Jan 22 14:29:11 2008 +0000
     9.2 +++ b/tools/libxen/Makefile.dist	Tue Jan 22 14:30:21 2008 +0000
     9.3 @@ -65,14 +65,14 @@ libxenapi.a: $(LIBXENAPI_OBJS)
     9.4  
     9.5  .PHONY: install
     9.6  install: all
     9.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
     9.8 +	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api
     9.9  	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
    9.10  	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
    9.11  	ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
    9.12  	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
    9.13  	$(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
    9.14  	set -e; for i in $(LIBXENAPI_HDRS); do \
    9.15 -	    $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
    9.16 +	    $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \
    9.17  	done
    9.18  
    9.19  
    10.1 --- a/tools/xenstore/Makefile	Tue Jan 22 14:29:11 2008 +0000
    10.2 +++ b/tools/xenstore/Makefile	Tue Jan 22 14:30:21 2008 +0000
    10.3 @@ -83,7 +83,7 @@ install: all
    10.4  	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
    10.5  	$(INSTALL_DIR) $(DESTDIR)/usr/bin
    10.6  	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
    10.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/include
    10.8 +	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
    10.9  	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
   10.10  	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
   10.11  	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
   10.12 @@ -93,8 +93,8 @@ install: all
   10.13  	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
   10.14  	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
   10.15  	$(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
   10.16 -	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
   10.17 -	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
   10.18 +	$(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR)
   10.19 +	$(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR)
   10.20  
   10.21  -include $(PROG_DEP)
   10.22