From 436a0cc876254132536eaacfc637029dc047cb1c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 1 Oct 2014 18:41:12 +0200 Subject: [PATCH] Substitue configure variables in Paths.mk.in This patch lays the groundwork to convert variables used in Makefiles to the common automake style, i.e. PREFIX becomes prefix, MANDIR becomes mandir and so on. The reason is that configure variables such as mandir expand to ${datarootdir}/man, and datarootdir expands to ${prefix}/share. This requires extra expansion in configure.ac before assigning to MANDIR. Special care must be taken when variable substition is done in other files, such as xencommons.in. All @VARIABLES@ used in these files have to be the expanded version, or all other variables must be available at runtime. This patch by itself changes nothing, but upcoming changes will make use of the lowercase variables. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu --- config/Paths.mk.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 4bded93938..65ca37b1b3 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -12,6 +12,23 @@ # # http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration +PACKAGE_TARNAME := @PACKAGE_TARNAME@ +prefix := @prefix@ +bindir := @bindir@ +sbindir := @sbindir@ +libdir := @libdir@ +libexecdir := @libexecdir@ +datarootdir := @datarootdir@ +mandir := @mandir@ +docdir := @docdir@ +dvidir := @dvidir@ +htmldir := @htmldir@ +pdfdir := @pdfdir@ +psdir := @psdir@ +includedir := @includedir@ +localstatedir := @localstatedir@ +sysconfdir := @sysconfdir@ + SBINDIR := @SBINDIR@ BINDIR := @BINDIR@ LIBEXEC := @LIBEXEC@ -- 2.30.2