mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
Add INCLUDEDIR. Use it.
Signed-off-by: Bastian Blank <waldi@debian.org>
This commit is contained in:
Keir Fraser committed
1 parent
c8107e1564
commit
2faf0fc95c
10 files changed
+22
-20
No files matched your search
@@ -18,6 +18,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
|
||||
INSTALL_PROG = $(INSTALL) -m0755 -p
|
||||
|
||||
PREFIX ?= /usr
|
||||
INCLUDEDIR = $(PREFIX)/include
|
||||
LIBDIR = $(PREFIX)/lib
|
||||
LIBDIR_x86_64 = $(PREFIX)/lib64
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
|
||||
INSTALL_PROG = $(INSTALL) -m0755 -p
|
||||
|
||||
PREFIX ?= /usr
|
||||
INCLUDEDIR = $(PREFIX)/include
|
||||
LIBDIR = $(PREFIX)/lib
|
||||
LIBDIR_x86_64 = $(PREFIX)/lib/amd64
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
@@ -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)
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -55,14 +55,14 @@ $(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
|
||||
|
||||
.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
|
||||
|
||||
|
||||
|
||||
@@ -65,14 +65,14 @@ $(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
|
||||
|
||||
.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
|
||||
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||