[Xorg-commit] xc/fonts/scaled/Meltho Imakefile,1.1,1.1.4.1 fonts.scale,1.1,NONE

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/fonts/scaled/Meltho
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/fonts/scaled/Meltho

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Removed Files:
      Tag: XORG-CURRENT
	fonts.scale 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/fonts/scaled/Meltho/Imakefile,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/Imakefile	14 Nov 2003 16:48:42 -0000	1.1
+++ b/Imakefile	23 Feb 2004 21:33:40 -0000	1.1.4.1
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/fonts/scaled/Meltho/Imakefile,v 1.2 2003/01/10 13:29:34 eich Exp $
+XCOMM $XFree86: xc/fonts/scaled/Meltho/Imakefile,v 1.3 2003/12/31 19:30:36 dawes Exp $
 
 FONTS = SyrCOMAdiabene.otf SyrCOMAntioch.otf SyrCOMBatnan.otf \
       SyrCOMBatnanBold.otf SyrCOMCtesiphon.otf SyrCOMEdessa.otf \
@@ -12,6 +12,7 @@
 
 FONTINSTDIR = $(FONTDIR)/OTF
 
+MakeFontsScale($(OBJS))
 MakeFontsDir(fonts.scale)
 
 #if UseFreetype2
@@ -19,7 +20,6 @@
 #endif
 
 InstallFonts($(FONTINSTDIR))
-InstallFontScale($(FONTINSTDIR))
 InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
 #if UseFreetype2
 InstallFcCache($(FONTINSTDIR))

--- fonts.scale DELETED ---