[xorg-commit-diffs] xc/extras/freetype2/builds/beos beos-def.mk, 1.1.4.1, 1.1.4.2 beos.mk, 1.1.4.1, 1.1.4.2 detect.mk, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/extras/freetype2/builds/beos
In directory pdx:/home/eich/tstbuild/xc/extras/freetype2/builds/beos

Modified Files:
      Tag: XORG-CURRENT
	beos-def.mk beos.mk detect.mk 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: beos-def.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/beos/beos-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/beos-def.mk	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/beos-def.mk	15 Apr 2004 10:14:15 -0000	1.1.4.2
@@ -5,7 +5,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,
@@ -19,11 +19,10 @@
   TOP_DIR := .
 endif
 
-DELETE   := rm -f
-SEP      := /
-HOSTSEP  := $(SEP)
-BUILD    := $(TOP_DIR)/builds/neos
-PLATFORM := beos
+DELETE    := rm -f
+SEP       := /
+BUILD_DIR := $(TOP_DIR)/builds/beos
+PLATFORM  := beos
 
 
 # The directory where all object files are placed.
@@ -36,7 +35,7 @@
 #   make -f $TOP_DIR/Makefile
 #
 ifndef OBJ_DIR
-  OBJ_DIR := $(TOP_DIR)$(SEP)objs
+  OBJ_DIR := $(TOP_DIR)/objs
 endif
 
 

Index: beos.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/beos/beos.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/beos.mk	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/beos.mk	15 Apr 2004 10:14:15 -0000	1.1.4.2
@@ -15,5 +15,5 @@
 include $(TOP_DIR)/builds/beos/beos-def.mk
 include $(TOP_DIR)/builds/link_std.mk
 
-# EOF
 
+# EOF

Index: detect.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/beos/detect.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/detect.mk	26 Nov 2003 22:48:21 -0000	1.1.4.1
+++ b/detect.mk	15 Apr 2004 10:14:15 -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,
@@ -27,15 +27,14 @@
 
 ifeq ($(PLATFORM),beos)
 
-  DELETE   := rm -f
-  SEP      := /
-  HOSTSEP  := $(SEP)
-  BUILD    := $(TOP_DIR)/builds/beos
+  DELETE      := rm -f
+  SEP         := /
+  BUILD_DIR   := $(TOP_DIR)/builds/beos
   CONFIG_FILE := beos.mk
 
   setup: std_setup
 
 endif   # test PLATFORM beos
 
-# EOF
 
+# EOF