? unxmacxp/bin/makedepend
Index: inc/unxmacxp.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxmacxp.mk,v
retrieving revision 1.40.4.3
diff -u -r1.40.4.3 unxmacxp.mk
--- inc/unxmacxp.mk	14 Aug 2002 06:05:08 -0000	1.40.4.3
+++ inc/unxmacxp.mk	3 Sep 2002 01:49:31 -0000
@@ -180,6 +180,11 @@
 INCGUI+= -I$(PRJ)$/unx/inc
 .ENDIF
 
+# [ed] 9/1/02 Since we've removed the internal freetype, add the default X11R6 path onto the linkline
+.IF "$(GUIBASE)" == "unx"
+INCGUI+= -I/usr/X11R6/include/freetype2
+.ENDIF
+
 LINKFLAGSAPPGUI=
 .IF "$(UNIXVERSIONNAMES)"!=""
 LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
Index: unxmacxp/bin/dmake
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/dmake,v
retrieving revision 1.2
diff -u -r1.2 dmake
Binary files /tmp/cvszsaG9N and dmake differ
Index: unxmacxp/bin/init-static-template-data
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/init-static-template-data,v
retrieving revision 1.31.4.3
diff -u -r1.31.4.3 init-static-template-data
--- unxmacxp/bin/init-static-template-data	29 Aug 2002 02:04:28 -0000	1.31.4.3
+++ unxmacxp/bin/init-static-template-data	3 Sep 2002 01:49:41 -0000
@@ -146,7 +146,7 @@
 	# instance that c++filt can process
 	paramcount=`printf "$tokens" | awk '{print NF - 1}'`
 	classtoken=`printf "$tokens" | awk '{print $1}' | sed 's/'"$paramcount"'$//'`
-	paramtoken=`print "$tokens" | awk '{print $2}'`
+	paramtoken=`printf "$tokens" | awk '{print $2}'`
 	datamembertoken=`printf "$tokens" | awk '{print $NF}' | sed 's/^.*\.//'`
 
 	# Unmangle name