[PATCH 2/4] fix hardcoded value of XPRINTDIR

[Daniel Stone]

On Tue, Jul 03, 2007 at 02:20:22PM -0700, Dan Nicholson wrote:
> On 7/3/07, Ademar de Souza Reis Jr <ademar at mandriva.com.br> wrote:
> > (now using the variable already set on configure: xpconfigdir)
> > ---
> >  hw/xprint/Makefile.am |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
> > index dc8764a..a687f35 100644
> > --- a/hw/xprint/Makefile.am
> > +++ b/hw/xprint/Makefile.am
> > @@ -4,7 +4,7 @@ bin_PROGRAMS = Xprt
> >
> >  Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
> >         -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
> > -       -DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
> > +       -DXPRINTDIR=\"@xpconfigdir@\"    \
> >         -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX \
> >         -DXFree86Server
> 
> Since xpconfigdir is AC_SUBSTed, wouldn't it be better to use
> $(xpconfigdir) there so it's substituted by make? That would ensure
> that all variables are resolved and you don't inadvertantly encode
> ${somevar} into xprint.

You need AC_DEFINE_DIR, instead of AC_SUBST.

Cheers,
Daniel