Index: xc/config/cf/X11.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v retrieving revision 1.32 diff -u -2 -0 -r1.32 X11.tmpl --- xc/config/cf/X11.tmpl 29 Aug 2004 21:06:00 -0000 1.32 +++ xc/config/cf/X11.tmpl 1 Sep 2004 23:23:58 -0000 @@ -4300,47 +4300,43 @@ InstallLink(install,srcmodelfontdir/fontfilename,fontfilename,destmodelfontdir) #endif /* InstallXpPMFLink */ /* * InstallXpMultiplePMFLinks - install multiple links for PMF fonts * from one print model to another */ #ifndef InstallXpMultiplePMFLinks #define InstallXpMultiplePMFLinks(list,srcmodelfontdir,destmodelfontdir) @@\ install:: @@\ MakeDir($(DESTDIR)destmodelfontdir) @@\ for i in list ; do \ @@\ $(RM) $(DESTDIR)destmodelfontdir/$$i ; \ @@\ $(LN) -s -f srcmodelfontdir/$$i $(DESTDIR)destmodelfontdir/$$i ; \ @@\ done #endif /* InstallXpPMFLink */ /* * InstallXpPMFFontsDir - make and install a fonts.dir index for model-config fonts */ #ifndef InstallXpPMFFontsDir -#if BuildServersOnly -#define InstallXpPMFFontsDir(destmodelfontdir) /**/ -#else #define InstallXpPMFFontsDir(destmodelfontdir) @@\ install:: @@\ ($(MKFONTSCALE) -b -s -l $(DESTDIR)destmodelfontdir) -#endif #endif /* InstallXpPMFFontsDir */ /* * MakeXkbDir */ #ifndef MakeXkbDir # if !CrossCompiling || UseInstalledOnCrossCompile # define MakeXkbDir(basedir,subdir) @@\ all:: Concat(subdir,.dir) @@\ @@\ Concat(subdir,.dir): @@\ RemoveFile(Concat(subdir,.dir)) @@\ $(XKBCOMPCMD) -lfhlpR -o Concat(subdir,.dir) '*' @@\ @@\ InstallTarget(install,Concat(subdir,.dir),$(INSTDATFLAGS),basedir) @@\ @@\ clean:: @@\ RemoveFile(Concat(subdir,.dir)) # else Index: xc/programs/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Imakefile,v retrieving revision 1.7 diff -u -2 -0 -r1.7 Imakefile --- xc/programs/Imakefile 16 Aug 2004 16:36:15 -0000 1.7 +++ xc/programs/Imakefile 1 Sep 2004 23:24:04 -0000 @@ -102,41 +102,43 @@ #if BuildRandRLibrary XRANDRDIR = xrandr #endif #if BuildXcursorgen XCURSORGENDIR = xcursorgen #endif #if BuildFontconfigLibrary FCDIRS = fc-cache fc-list #endif #if 0 FCLANGDIR = fc-lang #endif #if BuildXDriInfo XDRIINFO = xdriinfo #endif #if BuildServersOnly || !BuildClients -SUBDIRS = $(XSSRCDIR) +XCOMM mkfonscale is needed to build the minimum set of fonts +XCOMM (fixed, cursor and model-config metrics) +SUBDIRS = $(MKFONTSCALEDIR) $(XSSRCDIR) #else SUBDIRS = \ appres bdftopcf bitmap \ $(SCREENSAVESRCDIR) editres $(FCDIRS) $(FCLANGDIR) fslsfonts fstobdf \ iceauth ico listres luit \ $(MAKEPSRESDIR) $(DPSCLIENTDIRS) \ $(MKCFMSRCDIR) \ mkfontdir $(MKFONTSCALEDIR) oclock $(PROXYMGRSRCDIR) \ $(RGBSRCDIR) $(RSTARTSRCDIR) showfont \ $(SMPROXYSRCDIR) $(TWMSRCDIR) viewres x11perf xauth xbiff xcalc \ xclipboard xclock \ xcmsdb $(XCONSOLESRCDIR) xditview $(XDMSRCDIR) xdpyinfo \ $(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel $(XFSSRCDIR) xfsinfo \ $(XFINDPROXYSRCDIR) $(XFWPSRCDIR) $(XGAMMASRCDIR) xgc $(XHOSTSRCDIR) \ $(XINITSRCDIR) $(XKBSRCDIRS) xkill $(XLOADDIR) xlogo xlsatoms \ xlsclients xlsfonts xmag xman xmessage xmh xmodmap xprop xrdb \ xrefresh $(XRXSRCDIR) xset \ xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \ $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \ $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \ Index: xc/programs/mkfontscale/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/mkfontscale/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/mkfontscale/Imakefile 23 Apr 2004 19:54:36 -0000 1.2 +++ xc/programs/mkfontscale/Imakefile 1 Sep 2004 23:24:17 -0000 @@ -1,22 +1,33 @@ XCOMM $XFree86: xc/programs/mkfontscale/Imakefile,v 1.7tsi Exp $ LOCAL_LIBRARIES = $(XFONTENCLIB) $(FREETYPE2LIB) DEPLIBS = $(DEPXFONTENCLIB) $(DEPFREETYPE2LIB) SYS_LIBRARIES = GzipLibrary SRCS = mkfontscale.c list.c hash.c ident.c OBJS = mkfontscale.o list.o hash.o ident.o #if !HasSnprintf SNPRINTF_DEFINES = -DNEED_SNPRINTF SNPRINTF_INCLUDES = -I$(LIBSRC)/misc #endif INCLUDES = $(FREETYPE2INCLUDES) $(SNPRINTF_INCLUDES) -I$(XBUILDINCDIR) DEFINES = $(FREETYPE2DEFINES) $(SNPRINTF_DEFINES) -DXFREE86_FT2 +XCOMM If we are only building the servers then mkfontscale is being +XCOMM needed to build the minimum set of fonts (fixed, cursor and +XCOMM model-config metrics) but there is no need to install it +XCOMM (see https://freedesktop.org/bugzilla/show_bug.cgi?id=1213) +#if BuildServersOnly || !BuildClients +# undef InstallProgram +# undef InstallManPage +# define InstallProgram(a,b) /**/ +# define InstallManPage(a,b) /**/ +#endif /* BuildServersOnly || !BuildClients */ + ComplexProgramTarget(mkfontscale) LinkBuildBinary(ProgramTargetName(mkfontscale))