[Xorg-commit] xc/fonts/scaled/Type1 Imakefile,1.1.4.1,1.1.4.2 fonts.scale,1.1.4.1,NONE

[Kaleb Keithley]

Committed by: kaleb

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

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/Type1/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Imakefile	17 Nov 2003 19:03:40 -0000	1.1.4.1
+++ b/Imakefile	23 Feb 2004 21:33:44 -0000	1.1.4.2
@@ -3,7 +3,7 @@
 
 
 
-XCOMM $XFree86: xc/fonts/scaled/Type1/Imakefile,v 1.16 2002/05/22 04:30:14 keithp Exp $
+XCOMM $XFree86: xc/fonts/scaled/Type1/Imakefile,v 1.17 2003/12/31 19:30:39 dawes Exp $
 
 
 #define PassCDebugFlags /* as nothing */
@@ -30,13 +30,13 @@
 
 FONTINSTDIR = $(FONTDIR)/Type1
 
+MakeFontsScale($(OBJS))
 MakeFontsDir(fonts.scale)
 #if UseFreetype2
 MakeFcCache($(FONTS))
 #endif
 
 InstallFonts($(FONTINSTDIR))
-InstallFontScale($(FONTINSTDIR))
 InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
 #if UseFreetype2
 InstallFcCache($(FONTINSTDIR))

--- fonts.scale DELETED ---