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 INCLUDEDIR. Use it.

from [Xen patchbot-unstable] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Add INCLUDEDIR. Use it.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 23 Jan 2008 01:10:24 -0800
Delivery-date: Wed, 23 Jan 2008 01:12:29 -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 1201012221 0
# Node ID 89995ccec15a46a4e2f2b6e3ad3ce7c827a596ce
# Parent  6ed9b42d1ec4e8b2a87f82d631daec4d5c33506d
Add INCLUDEDIR. Use it.

Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
 config/StdGNU.mk                 |    1 +
 config/SunOS.mk                  |    1 +
 tools/blktap/lib/Makefile        |    4 ++--
 tools/flask/libflask/Makefile    |    4 ++--
 tools/guest-headers/Makefile     |    4 ++--
 tools/libfsimage/common/Makefile |    8 ++++----
 tools/libxc/Makefile             |    6 +++---
 tools/libxen/Makefile            |    4 ++--
 tools/libxen/Makefile.dist       |    4 ++--
 tools/xenstore/Makefile          |    6 +++---
 10 files changed, 22 insertions(+), 20 deletions(-)

diff -r 6ed9b42d1ec4 -r 89995ccec15a config/StdGNU.mk
--- a/config/StdGNU.mk  Tue Jan 22 14:29:11 2008 +0000
+++ b/config/StdGNU.mk  Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a config/SunOS.mk
--- a/config/SunOS.mk   Tue Jan 22 14:29:11 2008 +0000
+++ b/config/SunOS.mk   Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Tue Jan 22 14:29:11 2008 +0000
+++ b/tools/blktap/lib/Makefile Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile     Tue Jan 22 14:29:11 2008 +0000
+++ b/tools/flask/libflask/Makefile     Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a tools/guest-headers/Makefile
--- a/tools/guest-headers/Makefile      Tue Jan 22 14:29:11 2008 +0000
+++ b/tools/guest-headers/Makefile      Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a tools/libfsimage/common/Makefile
--- a/tools/libfsimage/common/Makefile  Tue Jan 22 14:29:11 2008 +0000
+++ b/tools/libfsimage/common/Makefile  Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a tools/libxc/Makefile
--- a/tools/libxc/Makefile      Tue Jan 22 14:29:11 2008 +0000
+++ b/tools/libxc/Makefile      Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a tools/libxen/Makefile
--- a/tools/libxen/Makefile     Tue Jan 22 14:29:11 2008 +0000
+++ b/tools/libxen/Makefile     Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a tools/libxen/Makefile.dist
--- a/tools/libxen/Makefile.dist        Tue Jan 22 14:29:11 2008 +0000
+++ b/tools/libxen/Makefile.dist        Tue Jan 22 14:30:21 2008 +0000
@@ -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 6ed9b42d1ec4 -r 89995ccec15a tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Tue Jan 22 14:29:11 2008 +0000
+++ b/tools/xenstore/Makefile   Tue Jan 22 14:30:21 2008 +0000
@@ -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-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 INCLUDEDIR. Use it., Xen patchbot-unstable <=
Previous by Date:  [Xen-changelog] [xen-unstable] Add BINDIR. Use it., Xen patchbot-unstable
Next by Date:  [Xen-changelog] [xen-unstable] Apply PREFIX directly to LIBDIR., Xen patchbot-unstable
Previous by Thread:  [Xen-changelog] [xen-unstable] Add BINDIR. Use it., Xen patchbot-unstable
Next by Thread:  [Xen-changelog] [xen-unstable] Apply PREFIX directly to LIBDIR., Xen patchbot-unstable
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

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