# HG changeset patch # User Bastian Blank <waldi@debian.org> # Date 1200745316 -3600 # Node ID 40573975eba54c8eb14b41b4bcf8645568308108 # Parent 9def133ba3123ed99e9b007bf91d07b2d58b4262 Add INCLUDEDIR. Use it. Signed-off-by: Bastian Blank <waldi@debian.org> diff -r 9def133ba312 -r 40573975eba5 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 @@ -18,6 +18,7 @@ INSTALL_PROG = $(INSTALL) -m0755 -p INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX = /usr +INCLUDEDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib LIBDIR_x86_64 = $(PREFIX)/lib64 diff -r 9def133ba312 -r 40573975eba5 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 @@ -19,6 +19,7 @@ INSTALL_PROG = $(INSTALL) -m0755 -p INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX = /usr +INCLUDEDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib LIBDIR_x86_64 = $(PREFIX)/lib/amd64 diff -r 9def133ba312 -r 40573975eba5 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 @@ -41,11 +41,11 @@ libblktap: libblktap.a install: all $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)/usr/include + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR) ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR) ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so - $(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include + $(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR) clean: rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS diff -r 9def133ba312 -r 40573975eba5 tools/flask/libflask/Makefile --- a/tools/flask/libflask/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/flask/libflask/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -34,12 +34,12 @@ build: .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR) ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR) ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so - $(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include + $(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS TAGS: diff -r 9def133ba312 -r 40573975eba5 tools/guest-headers/Makefile --- a/tools/guest-headers/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/guest-headers/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -10,8 +10,8 @@ check: .PHONY: install install: - mkdir -p $(DESTDIR)/usr/include/xen/sys - $(INSTALL_DATA) $(XEN_ROOT)/tools/include/$(XEN_OS)/*.h $(DESTDIR)/usr/include/xen/sys + mkdir -p $(DESTDIR)$(INCLUDEDIR)/xen/sys + $(INSTALL_DATA) $(XEN_ROOT)/tools/include/$(XEN_OS)/*.h $(DESTDIR)$(INCLUDEDIR)/xen/sys .PHONY: clean clean: diff -r 9def133ba312 -r 40573975eba5 tools/libfsimage/common/Makefile --- a/tools/libfsimage/common/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/libfsimage/common/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -23,13 +23,13 @@ all: $(LIB) .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR) ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so - $(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include - $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include - $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include + $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR) clean distclean: rm -f $(PIC_OBJS) $(LIB) $(DEPS) diff -r 9def133ba312 -r 40573975eba5 tools/libxc/Makefile --- a/tools/libxc/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/libxc/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -104,18 +104,18 @@ check-for-zlib: .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so - $(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include + $(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so - $(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include + $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS TAGS: diff -r 9def133ba312 -r 40573975eba5 tools/libxen/Makefile --- a/tools/libxen/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/libxen/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -55,14 +55,14 @@ libxenapi.a: $(LIBXENAPI_OBJS) .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR) ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR) set -e; for i in $(LIBXENAPI_HDRS); do \ - $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \ done diff -r 9def133ba312 -r 40573975eba5 tools/libxen/Makefile.dist --- a/tools/libxen/Makefile.dist Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/libxen/Makefile.dist Sat Jan 19 13:21:56 2008 +0100 @@ -65,14 +65,14 @@ libxenapi.a: $(LIBXENAPI_OBJS) .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR) ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR) set -e; for i in $(LIBXENAPI_HDRS); do \ - $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \ done diff -r 9def133ba312 -r 40573975eba5 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 @@ -83,7 +83,7 @@ install: all $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored $(INSTALL_DIR) $(DESTDIR)/usr/bin $(INSTALL_DIR) $(DESTDIR)/usr/sbin - $(INSTALL_DIR) $(DESTDIR)/usr/include + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin @@ -93,8 +93,8 @@ install: all ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) xs.h $(DESTDIR)/usr/include - $(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include + $(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR) -include $(PROG_DEP) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel