[PATCH] Fix build with BSD make.

Alan Coopersmith alan.coopersmith at oracle.com
Sun Feb 13 16:44:35 PST 2011


On 02/13/11 12:51 PM, Matthieu Herrb wrote:
> $< is not allowed in explicit rules.

Solaris make has the same limitation, but since I have to use gnu make due to
the sinclude in hw/xfree86/loader/Makefile.am I'd not noticed that yet.

> Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>
> ---
>  hw/xfree86/Makefile.am |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
> index c23b1fd..10d7fc8 100644
> --- a/hw/xfree86/Makefile.am
> +++ b/hw/xfree86/Makefile.am
> @@ -114,7 +114,7 @@ CONF_SUBSTS =	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
>  		-e 's|DEFAULTFONTPATH|$(COMPILEDDEFAULTFONTPATH)|g'
>  
>  xorg.conf.example: xorgconf.cpp
> -	$(AM_V_GEN)$(SED) $(CONF_SUBSTS) < $< > $@
> +	$(AM_V_GEN)$(SED) $(CONF_SUBSTS) < ${srcdir}/xorgconf.cpp > $@
>  
>  relink:
>  	$(AM_V_at)rm -f Xorg && $(MAKE) Xorg

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>


-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list