--- Make/makedefs.orig	Thu Oct  2 22:43:39 2003
+++ Make/makedefs	Sat Oct 18 01:04:39 2003
@@ -359,17 +359,17 @@
 
 #### FreeBSD specific definitions
 ifeq ($(OS),FreeBSD)
-  C++               = g++
+  C++               = ${CXX}
   DEPARG            = -MM
-  INC               +=  -I/usr/local/include -I/usr/X11R6/include
+  INC               += -I${LOCALBASE}/include -I${X11BASE}/include
   DEF               += -W -Wall
-  OPTF              = -O2 
+  OPTF              = %%CXXFLAGS%%
   DBGF              = -g -DOSG_COMPILE_UNIT_TESTS
   SHARED            = -shared
   ARCH              = 
   ARCHINST          = 
   ARCHARGS          = 
-  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
+  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib
   DYNAMICLIBRARYLIB = 
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   FREETYPE_LIB      = -lfreetype
@@ -377,9 +377,17 @@
   X_INC             = -I/usr/X11R6/include
   X_LIBS            = -lXmu -lX11
   SOCKET_LIBS       = 
-  OTHER_LIBS        = -lOpenThreads
-  INST_LOCATION     = /opt/X11R6
-  INST_SHARE        = /usr/share/OpenSceneGraph
+  OTHER_LIBS        = -lOpenThreads ${PTHREAD_LIBS}
+  INST_LOCATION     = ${PREFIX}
+  INST_SHARE        = ${PREFIX}/share
+  INST_EXAMPLES     = ${INST_SHARE}/examples/osg/bin
+  INST_EXAMPLE_SRC  = ${INST_SHARE}/examples/osg/src
+  INST_DOC          = ${INST_SHARE}/doc/osg
+  INST_SRC          = ${INST_EXAMPLE_SRC}
+  INST_DATA         = ${INST_SHARE}/osg
+  INSTBINCMD        = ${BSD_INSTALL_PROGRAM}
+  INSTDEVCMD        = ${BSD_INSTALL_DATA}
+  LIBXML2_INCLUDE   = -I${LOCALBASE}/include/libxml2
 endif
 
 #### MacOS X specific definitions