Re: [Xen-devel] [PATCH v6 10/13] autoconf: xen: move standard path variables to config/Paths.mk.in

["Luis R. Rodriguez" <mcgrof@xxxxxxxx>]

On Wed, Jul 02, 2014 at 02:34:14PM +0100, Ian Campbell wrote:
> On Thu, 2014-06-12 at 18:18 -0700, Luis R. Rodriguez wrote:
> > diff --git a/m4/paths.m4 b/m4/paths.m4
> > new file mode 100644
> > index 0000000..717fcd1
> > --- /dev/null
> > +++ b/m4/paths.m4
> > @@ -0,0 +1,61 @@
> > +AC_DEFUN([AX_XEN_EXPAND_CONFIG], [
> > +dnl expand these early so we can use this for substitutions
> > +test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
> > +test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix
> 
> This is a bit of shame. I suppose this needs to happen in the middle of
> AC_OUTPUT which isn't possible?
> 
> autoconf itself seems to quote the prefix so it is not expanded until
> later, i.e. when config.status is run. Would that work here?

Its unclear what exactly the recommendation is here.

> Or perhaps we should just PREFIX=$prefix AC_SUBST(PREFIX) and put all
> the BINDIR=$PREFIX/bin into Paths.mk.in after PREFIX=@PREFIX@?

Why though?

> > +BINDIR=$prefix/bin
> > +AC_SUBST(BINDIR)
> > +
> > +SBINDIR=$prefix/sbin
> > +AC_SUBST(SBINDIR)
> > +
> > +dnl XXX: this should be changed to use the passed $libexec
> > +dnl but can be done as a second step
> > +LIBEXEC=$prefix/lib/xen/bin
> > +AC_SUBST(LIBEXEC)
> > +
> > +LIBDIR=`eval echo $libdir`
> 
> Why is this one an eval?

Yeah you're right, its not needed this should work just as well:

LIBDIR=$libdir

I've amended this change.

> > diff --git a/stubdom/Makefile b/stubdom/Makefile
> > index c41de27..ef99e3e 100644
> > --- a/stubdom/Makefile
> > +++ b/stubdom/Makefile
> > @@ -7,6 +7,7 @@ export stubdom=y
> >  export debug=y
> >  include $(XEN_ROOT)/Config.mk
> >  -include $(XEN_ROOT)/config/Stubdom.mk
> > +include $(XEN_ROOT)/config/Paths.mk
> 
> The reason for the -include of Stubdom.mk is so that if it doesn't exist
> enogh of the Makefile is still run to get:
> ifeq (,$(findstring clean,$(MAKECMDGOALS)))
> $(XEN_ROOT)/config/Stubdom.mk:
>         $(error You have to run ./configure before building or installing 
> stubdom)
> endif
> 
> You included Paths.mk from Stubdom.mk (and Tools.mk etc) so I think
> these ones are redundant.

OK ammended.

  Luis

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel