[Xen-changelog] [xen master] tools: replace private PREFIX with automake prefix

[patchbot@xxxxxxx]

commit 7f5f57b466b026d19cacfe7fc5771895d05a053b
Author:     Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Mon May 11 15:24:51 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu May 21 15:12:10 2015 +0100

    tools: replace private PREFIX with automake prefix
    
    Reuse automake variable instead of inventing a private variable.
    
    Only qemu-traditional expects PREFIX in environment, which is provided
    by buildmakevars2shellvars.
    
    Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
    Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 Config.mk          |    6 +++---
 config/Paths.mk.in |    2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Config.mk b/Config.mk
index 1312a80..ec16961 100644
--- a/Config.mk
+++ b/Config.mk
@@ -75,8 +75,8 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib
 endif
 
 PYTHON      ?= python
-PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
-# The above requires that PREFIX contains *no spaces*. This variable is here
+PYTHON_PREFIX_ARG ?= --prefix="$(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
 
@@ -142,7 +142,7 @@ define as-insn-check-closure
 endef
 
 define buildmakevars2shellvars
-    export PREFIX="$(PREFIX)";                                            \
+    export PREFIX="$(prefix)";                                            \
     export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)";                            \
     export XEN_ROOT="$(XEN_ROOT)"
 endef
diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 1653f26..bf9bd51 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -29,8 +29,6 @@ includedir               := @includedir@
 localstatedir            := @localstatedir@
 sysconfdir               := @sysconfdir@
 
-PREFIX                   := $(prefix)
-
 LIBEXEC                  := $(libexecdir)/$(PACKAGE_TARNAME)
 LIBEXEC_BIN              := @LIBEXEC_BIN@
 LIBEXEC_LIB              := $(LIBEXEC)/lib
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog