diff options
| author | Olaf Hering <olaf@aepfle.de> | 2014-10-01 18:41:26 +0200 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2014-10-06 17:00:23 +0100 |
| commit | b9f3352cd695d866c5cbee94cc986b312835f44b (patch) | |
| tree | ae24e36d35d1b7840df8b4aa03a6f522ce38daa8 | |
| parent | ec402e17fbbedbf76aeaadfadc52a26414111d5a (diff) | |
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>
| -rw-r--r-- | config/Docs.mk.in | 7 | ||||
| -rw-r--r-- | config/Paths.mk.in | 2 | ||||
| -rw-r--r-- | config/Stubdom.mk.in | 6 | ||||
| -rw-r--r-- | config/Tools.mk.in | 9 | ||||
| -rw-r--r-- | tools/Rules.mk | 1 |
5 files changed, 5 insertions, 20 deletions
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 |