[Pkg-xen-changes] [xen] 05/30: config-prefix.diff

[Bastian Blank]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch develop
in repository xen.

commit a8f7ae30f31b8332e7a802c3b26f520e2a465ece
Author: Bastian Blank <waldi at debian.org>
Date:   Sat Jul 5 11:46:45 2014 +0200

    config-prefix.diff
    
    Patch-Name: config-prefix.diff
---
 Config.mk          | 2 +-
 config/Paths.mk.in | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Config.mk b/Config.mk
index 54fbb9d..675bc18 100644
--- a/Config.mk
+++ b/Config.mk
@@ -75,7 +75,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib
 endif
 
 PYTHON      ?= python
-PYTHON_PREFIX_ARG ?= --prefix="$(prefix)"
+PYTHON_PREFIX_ARG ?= --home="$(LIBEXEC)"
 # 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/Paths.mk.in b/config/Paths.mk.in
index d36504f..c3b043f 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -13,6 +13,7 @@
 # http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration
 
 PACKAGE_TARNAME          := @PACKAGE_TARNAME@
+PACKAGE_VERSION          := @PACKAGE_VERSION@
 prefix                   := @prefix@
 bindir                   := @bindir@
 sbindir                  := @sbindir@
@@ -29,8 +30,12 @@ includedir               := @includedir@
 localstatedir            := @localstatedir@
 sysconfdir               := @sysconfdir@
 
-LIBEXEC                  := $(libexecdir)/$(PACKAGE_TARNAME)
-LIBEXEC_BIN              := @LIBEXEC_BIN@
+PREFIX                   := $(prefix)
+
+SBINDIR                  := $(sbindir)
+BINDIR                   := $(bindir)
+LIBEXEC                  := $(libexecdir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+LIBEXEC_BIN              := $(LIBEXEC)/bin
 LIBEXEC_LIB              := $(LIBEXEC)/lib
 LIBEXEC_INC              := $(LIBEXEC)/include
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git