[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r35639 - in trunk: . build/generator

From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA_at_GMail.Com>
Date: Wed, 4 Feb 2009 22:21:11 +0100

2009-02-03 17:04:29 Stefan Sperling napisaƂ(a):
> On Mon, Feb 02, 2009 at 04:52:24PM -0800, Arfrever Frehtes Taifersar Arahesis wrote:
> > Author: arfrever
> > Date: Mon Feb 2 16:52:24 2009
> > New Revision: 35639
> >
> > Log:
> > Fix value of __FILE__ in subversion/mod_authz_svn/mod_authz_svn.c,
> > subversion/mod_dav_svn/mod_dav_svn.c and some JavaHL files,
> > when $(abs_builddir) == $(abs_srcdir).
> >
> > * Makefile.in
> > (srcpath): Define when $(abs_builddir) != $(abs_srcdir).
> >
> > * build/generator/gen_make.py
> > (Generator.write): Use '$(srcpath)' instead of '$(abs_srcdir)/'.
> >
> > Modified:
> > trunk/Makefile.in
> > trunk/build/generator/gen_make.py
> >
> > Modified: trunk/Makefile.in
> > URL: http://svn.collab.net/viewvc/svn/trunk/Makefile.in?pathrev=35639&r1=35638&r2=35639
> > ==============================================================================
> > --- trunk/Makefile.in Mon Feb 2 11:37:19 2009 (r35638)
> > +++ trunk/Makefile.in Mon Feb 2 16:52:24 2009 (r35639)
> > @@ -69,6 +69,10 @@ datadir = @datadir@
> > datarootdir = @datarootdir@
> > localedir = @localedir@
> >
> > +ifneq ($(abs_builddir), $(abs_srcdir))
> > + srcpath = $(abs_srcdir)/
> > +endif
> > +
>
> This bit breaks BSD make:
>
> "Makefile", line 72: Missing dependency operator
> "Makefile", line 74: Need an operator
> Fatal errors encountered -- cannot continue
>
> I don't think there is a portable way of doing if-then-else in make.
> Can this be done somehow differently? Otherwise, we should make clear
> that we only support GNU make.

Fixed in r35688.

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2009-02-04 22:21:58 CET

This is an archived mail posted to the Subversion Dev mailing list.