[PATCH:util/cf] Use font-util 1.1 XORG_FONTROOTDIR to set FontDir in site.def
Yaakov (Cygwin/X)
yselkowitz at users.sourceforge.net
Thu Oct 15 10:47:35 PDT 2009
On 15/10/2009 12:25, Yaakov (Cygwin/X) wrote:
> 1) To match the defaults in font-util, in X11.tmpl change:
>
> #ifndef FontDir
> #define FontDir $(LIBDIR)/fonts
> #endif
> #ifndef FontEncDir
> #define FontEncDir $(LIBDIR)/fonts/encodings
> #endif
>
> to something like:
>
> #ifndef FontDir
> # ifdef ProjectRoot
> # define FontDir Concat(ProjectRoot,/share/fonts/X11)
> # else
> # define FontDir /usr/share/fonts/X11
> # endif
> #endif
> #ifndef FontEncDir
> #define FontEncDir Concat(FontDir,/encodings)
> #endif
OTOH perhaps this part is a bit overboard. Instead you could add to
configure.ac:
XORG_FONTSUBDIR([ENCODINGSDIR],[encodingsdir],[encodings])
and add to site.def.in:
#ifndef FontEncDir
#define FontEncDir @ENCODINGSDIR@
#endif
and leave it at that. Dealing with all the #ifdef's that really
shouldn't NOT be defined is a different discussion entirely.
Ah, isn't imake just SO much fun? :-)
Yaakov
Cygwin/X
More information about the xorg-devel
mailing list