diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-03-31 13:30:50 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-03-31 13:30:50 +0100 |
| commit | 98da66a3bda9c9d31630c7d794db68413916a104 (patch) | |
| tree | b12ad747fe7ffcdf7dda42c266ff0e5cfce3c374 | |
| parent | e24c23a5110ee350c95ed7400f8270e4bb4d9f33 (diff) | |
| download | xen-98da66a3bda9c9d31630c7d794db68413916a104.tar.gz xen-98da66a3bda9c9d31630c7d794db68413916a104.tar.bz2 xen-98da66a3bda9c9d31630c7d794db68413916a104.zip | |
build: Get rid of some more hardcoded install paths
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
| -rw-r--r-- | Config.mk | 6 | ||||
| -rw-r--r-- | config/StdGNU.mk | 3 | ||||
| -rw-r--r-- | tools/pygrub/Makefile | 2 | ||||
| -rw-r--r-- | tools/python/Makefile | 10 |
4 files changed, 12 insertions, 9 deletions
@@ -19,8 +19,6 @@ HOSTCFLAGS += -fno-strict-aliasing DISTDIR ?= $(XEN_ROOT)/dist DESTDIR ?= / -DOCDIR ?= /usr/share/doc/xen -MANDIR ?= /usr/share/man # Allow phony attribute to be listed as dependency rather than fake target .PHONY: .phony @@ -28,6 +26,10 @@ MANDIR ?= /usr/share/man include $(XEN_ROOT)/config/$(XEN_OS).mk include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk +SHAREDIR ?= $(PREFIX)/share +DOCDIR ?= $(SHAREDIR)/doc/xen +MANDIR ?= $(SHAREDIR)/man + ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR) diff --git a/config/StdGNU.mk b/config/StdGNU.mk index d3d69bf944..812d389a28 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -31,7 +31,8 @@ LIBDIR = $(PREFIX)/$(LIBLEAFDIR) LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32) LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) LIBEXEC = $(LIBDIR_x86_32)/xen/bin -MANDIR = $(PREFIX)/share/man +SHAREDIR = $(PREFIX)/share +MANDIR = $(SHAREDIR)/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 SBINDIR = $(PREFIX)/sbin diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 03c8ed9530..48e982c075 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -12,7 +12,7 @@ build: ifndef XEN_PYTHON_NATIVE_INSTALL install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()") install: all - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --install-lib="$(DESTDIR)$(LIBPATH)/python" + CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)$(PREFIX)" --prefix="" --install-lib="$(DESTDIR)$(LIBDIR)/python" $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot else install: all diff --git a/tools/python/Makefile b/tools/python/Makefile index 4ae0a2d777..249bf634e7 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -12,7 +12,7 @@ PODIR := xen/xm/messages POTFILE := $(PODIR)/xen-xm.pot I18NSRCFILES = $(shell find xen/xm/ -name '*.py') CATALOGS = $(patsubst %,xen/xm/messages/%.mo,$(LINGUAS)) -NLSDIR = /usr/share/locale +NLSDIR = $(SHAREDIR)/locale .PHONY: build buildpy buildpy: @@ -57,19 +57,19 @@ refresh-po: $(POTFILE) ifndef XEN_PYTHON_NATIVE_INSTALL install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()") install: install-messages install-dtd - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force --install-lib="$(DESTDIR)$(LIBPATH)/python" + CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)$(PREFIX)" --prefix="" --force --install-lib="$(DESTDIR)$(LIBDIR)/python" else install: install-messages install-dtd CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force endif install-dtd: all - $(INSTALL_DIR) $(DESTDIR)/usr/share/xen - $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)/usr/share/xen + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) + $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(DOCDIR) install-messages: all set -e; if which $(MSGFMT) >/dev/null ; then \ - mkdir -p $(DESTDIR)$(NLSDIR); \ + $(INSTALL_DIR) $(DESTDIR)$(NLSDIR); \ for l in $(LINGUAS); do \ $(INSTALL_DIR) $(DESTDIR)$(NLSDIR)/$$l; \ $(INSTALL_DIR) $(DESTDIR)$(NLSDIR)/$$l/LC_MESSAGES; \ |