[Xorg-commit] xc/extras/freetype2/builds/ansi ansi-def.mk,1.1.4.1,1.1.4.2 ansi.mk,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/extras/freetype2/builds/ansi
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/freetype2/builds/ansi

Modified Files:
      Tag: XORG-CURRENT
	ansi-def.mk ansi.mk 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: ansi-def.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/ansi/ansi-def.mk,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/ansi-def.mk	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/ansi-def.mk	23 Feb 2004 21:32:04 -0000	1.1.4.2
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,11 +17,10 @@
   TOP_DIR := .
 endif
 
-DELETE   := rm -f
-SEP      := /
-HOSTSEP  := $(SEP)
-BUILD    := $(TOP_DIR)/builds/ansi
-PLATFORM := ansi
+DELETE    := rm -f
+SEP       := /
+BUILD_DIR := $(TOP_DIR)/builds/ansi
+PLATFORM  := ansi
 
 
 # The directory where all object files are placed.
@@ -34,7 +33,7 @@
 #   make -f $TOP_DIR/Makefile
 #
 ifndef OBJ_DIR
-  OBJ_DIR := $(TOP_DIR)$(SEP)objs
+  OBJ_DIR := $(TOP_DIR)/objs
 endif
 
 

Index: ansi.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/ansi/ansi.mk,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/ansi.mk	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/ansi.mk	23 Feb 2004 21:32:04 -0000	1.1.4.2
@@ -17,4 +17,5 @@
 include $(TOP_DIR)/builds/compiler/ansi-cc.mk
 include $(TOP_DIR)/builds/link_std.mk
 
+
 # EOF