[Pkg-xen-changes] [xen] 15/128: config-prefix.diff
Ian Campbell
ijc-guest at moszumanska.debian.org
Sat Jul 12 09:06:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
ijc-guest pushed a commit to branch feature/4.4-updates
in repository xen.
commit 8b0bf3ad05a7e948baa42a05f65fa5ff7c7cc5be
Author: Bastian Blank <waldi at debian.org>
Date: Sat Jul 5 11:46:45 2014 +0200
config-prefix.diff
---
Config.mk | 2 +-
config/StdGNU.mk | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Config.mk b/Config.mk
index eb2c192..953122b 100644
--- a/Config.mk
+++ b/Config.mk
@@ -84,7 +84,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib
endif
PYTHON ?= python
-PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
+PYTHON_PREFIX_ARG ?= --home="$(PRIVATE_PREFIX)"
# The above requires that PREFIX contains *no spaces*. This variable is here
# to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug:
# https://bugs.launchpad.net/ubuntu/+bug/362570
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 25fc594..b566b5c 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -30,16 +30,19 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
PREFIX ?= /usr
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
-LIBEXEC = $(PREFIX)/lib/xen/bin
+LIBDIR = $(PREFIX)/lib
SHAREDIR = $(PREFIX)/share
MANDIR = $(SHAREDIR)/man
MAN1DIR = $(MANDIR)/man1
MAN8DIR = $(MANDIR)/man8
SBINDIR = $(PREFIX)/sbin
-XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot
-PRIVATE_PREFIX = $(LIBDIR)/xen
+PRIVATE_PREFIX = $(LIBDIR)/xen-$(XEN_VERSION)
PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib
+
+LIBEXEC = $(PRIVATE_BINDIR)
+XENFIRMWAREDIR = $(PRIVATE_PREFIX)/boot
CONFIG_DIR = /etc
XEN_LOCK_DIR = /var/lock
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git
More information about the Pkg-xen-changes
mailing list