--- Make/makedefs.orig	Thu Apr 25 18:09:27 2002
+++ Make/makedefs	Sat May 25 09:00:40 2002
@@ -38,10 +38,10 @@
 INST_PLUGINS       = $(INST_SYS_PREFIX)/lib$(ARCH)/osgPlugins
 INST_INCLUDE       = $(INST_SYS_PREFIX)/include
 INST_SHARE_PREFIX  = /usr/share
-INST_DEMOS         = $(INST_SHARE_PREFIX)/OpenSceneGraph/bin
-INST_SRC           = $(INST_SHARE_PREFIX)/OpenSceneGraph/src
-INST_DOC           = $(INST_SHARE_PREFIX)/OpenSceneGraph/doc
-INST_DATA          = $(INST_SHARE_PREFIX)/OpenSceneGraph/data
+INST_DEMOS         = $(INST_SHARE_PREFIX)/osg/bin
+INST_SRC           = $(INST_SHARE_PREFIX)/osg/src
+INST_DOC           = $(INST_SHARE_PREFIX)/osg/doc
+INST_DATA          = $(INST_SHARE_PREFIX)/osg/data
 INST_DEMO_SRC      = $(INST_SRC)/demos
 
 LINK               = ln -sf
@@ -185,7 +185,7 @@
 
 #### FreeBSD specific definitions
 ifeq ($(OS),FreeBSD)
-  C++               = g++
+  C++               = ${CXX}
   DEPARG            = -MM
   INC               +=  -I/usr/local/include -I/usr/X11R6/include
   DEF               += -W -Wall
@@ -193,7 +193,7 @@
   DBGF              = -g
   SHARED            = -shared
   ARCHARGS          = 
-  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
+  LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -rpath /usr/X11R6/lib
   DYNAMICLIBRARYLIB = 
   OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
   FREETYPE_LIB      = -lfreetype
@@ -203,8 +203,10 @@
   SOCKET_LIBS       = 
   OTHER_LIBS        = 
 
-  INST_SYS_PREFIX   = /opt/X11R6
-  INST_SHARE_PREFIX = /usr/share/OpenSceneGraph
+  INST_SYS_PREFIX   = /usr/X11R6
+  INST_SHARE_PREFIX = /usr/X11R6/share
+  INST_LIBS         = $(INST_SYS_PREFIX)/lib
+  INST_PLUGINS      = $(INST_SYS_PREFIX)/lib/osgPlugins
 
 endif