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 <o...@aepfle.de> Cc: Ian Jackson <ian.jack...@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabell...@eu.citrix.com> Cc: Ian Campbell <ian.campb...@citrix.com> Cc: Wei Liu <wei.l...@citrix.com> --- 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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
