--- uppsrc/ide/Makefile.orig	Mon Apr 16 19:28:22 2007
+++ uppsrc/ide/Makefile	Mon Apr 16 19:36:46 2007
@@ -1,12 +1,11 @@
 UPPDIR1 = uppsrc/
 
 UPPOUT = out/
-CINC =  -I$(UPPDIR1) -I/usr/include/freetype2 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0
-Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagLINUX
-CC = c++ -c -O3 -ffunction-sections 
-C_FLAGS = $(CC) -x c
-CPPFLAGS = $(CC) -x c++ 
-LIBPATH =  -L"/usr/X11R6/lib"
+CINC =  -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0
+Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD
+C_FLAGS = $(CC) -x c -c $(CFLAGS)
+CPPFLAGS = $(CC) -x c++ -c $(CXXFLAGS)
+LIBPATH =  -L$(X11BASE)/lib -L$(LOCALBASE)/lib
 AR = ar -sr
 OutDir_ide = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Shared/
 Macro_ide = $(Macro) -DflagMAIN