mkfontdir: Changes to 'master'

Jon TURNEY jon.turney at dronecode.org.uk
Mon Mar 14 06:09:21 PDT 2011


On 11/03/2011 22:37, Alan Coopersmith wrote:
>  Makefile.am |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> New commits:
> commit ad5fefcc7a0a0beb1c02270d9f28c8b28da61199
> Author: Alan Coopersmith <alan.coopersmith at oracle.com>
> Date:   Fri Mar 11 14:10:19 2011 -0800
> 
>     Make Makefile.am compatible with Solaris make
>     
>     Solaris make won't substitute $< in explicit rules, only implicit ones

This change seems to break on my tinderbox, see [1], I think because it
doesn't work for builddir != srcdir builds? Perhaps the following is needed?

--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST = $(bin_SCRIPTS:=.in)
 DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'

 mkfontdir: mkfontdir.in
-       $(AM_V_GEN)$(SED) $(DIR_SUBSTS) < mkfontdir.in > $@
+       $(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@

 MAINTAINERCLEANFILES = ChangeLog INSTALL


[1] http://tinderbox.freedesktop.org/builds/2011-03-13-0008/logs/mkfontdir/


More information about the xorg-devel mailing list