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

[Kaleb Keithley]

Committed by: kaleb

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

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/CID/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:34 -0000	1.1.4.1
@@ -1,13 +1,13 @@
-XCOMM $XFree86: xc/fonts/scaled/CID/Imakefile,v 1.4 1999/08/28 11:45:39 dawes Exp $
+XCOMM $XFree86: xc/fonts/scaled/CID/Imakefile,v 1.5 2003/12/31 19:30:36 dawes Exp $
 
 FONTINSTDIR = $(FONTDIR)/CID
 
+MakeFontsScale(NullParameter)
 MakeFontsDir(fonts.scale)
 
 /*
  * Replace the next line with 'InstallFonts($(FONTINSTDIR))' when fonts are
  * added.
  */
-InstallTarget(install,fonts.dir,$(INSTDATFLAGS),$(FONTINSTDIR))
+InstallFontsDir($(FONTINSTDIR))
 
-InstallFontScale($(FONTINSTDIR))

--- fonts.scale DELETED ---