From: Olaf Hering <olaf@aepfle.de>
Date: Wed, 1 Oct 2014 16:41:26 +0000 (+0200)
Subject: Use Paths.mk for docs, stubdom and tools build
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4230
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b9f3352cd695d866c5cbee94cc986b312835f44b;p=xen.git

Use Paths.mk for docs, stubdom and tools build

Paths.mk contains just directories set by configure.
Source this file first when building docs,stubdom or tools.
Remove unused path variables from $subsystem.mk.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/config/Docs.mk.in b/config/Docs.mk.in
index 497650f6d8..33bd52925a 100644
--- a/config/Docs.mk.in
+++ b/config/Docs.mk.in
@@ -1,9 +1,4 @@
-# Prefix and install folder
-prefix              := @prefix@
-PREFIX              := $(prefix)
-exec_prefix         := @exec_prefix@
-libdir              := @libdir@
-LIBDIR              := $(libdir)
+-include $(XEN_ROOT)/config/Paths.mk
 
 # Tools
 FIG2DEV             := @FIG2DEV@
diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 50d40ccbf7..fe10f76b3c 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -29,6 +29,8 @@ includedir               := @includedir@
 localstatedir            := @localstatedir@
 sysconfdir               := @sysconfdir@
 
+PREFIX                   := $(prefix)
+
 SBINDIR                  := $(sbindir)
 BINDIR                   := $(bindir)
 LIBEXEC                  := $(libexecdir)/$(PACKAGE_TARNAME)
diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in
index c1c83bc206..9098cbf85d 100644
--- a/config/Stubdom.mk.in
+++ b/config/Stubdom.mk.in
@@ -1,10 +1,4 @@
-# Prefix and install folder
 -include $(XEN_ROOT)/config/Paths.mk
-prefix              := @prefix@
-PREFIX              := $(prefix)
-exec_prefix         := @exec_prefix@
-libdir              := @libdir@
-LIBDIR              := $(libdir)
 
 # Path Programs
 CMAKE               := @CMAKE@
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index bf437f6eb8..545bdc0d12 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -1,15 +1,10 @@
+-include $(XEN_ROOT)/config/Paths.mk
+
 CONFIG_RUMP         := @CONFIG_RUMP@
 ifeq ($(CONFIG_RUMP),y)
 XEN_OS              := NetBSDRump
 endif
 
-# Prefix and install folder
-prefix              := @prefix@
-PREFIX              := $(prefix)
-exec_prefix         := @exec_prefix@
-libdir              := @libdir@
-LIBDIR              := $(libdir)
-
 # A debug build of tools?
 debug               := @debug@
 
diff --git a/tools/Rules.mk b/tools/Rules.mk
index e2fdf63499..87a56dc9cc 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -5,7 +5,6 @@ all:
 
 -include $(XEN_ROOT)/config/Tools.mk
 include $(XEN_ROOT)/Config.mk
--include $(XEN_ROOT)/config/Paths.mk
 
 export _INSTALL := $(INSTALL)
 INSTALL = $(XEN_ROOT)/tools/cross-install