diff --git a/Makefile b/Makefile
index 46b754e5d..a2de69158 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ DIRS = src
 
 VERSION = osg-0.8.43
 
-export TOP := $(shell pwd)
+export OSGHOME := $(shell pwd)
 
 all : $(MAKE_PREP)
 	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
@@ -129,7 +129,7 @@ dev: $(MAKE_PREP)
 	(cd ..; tar cvf - $(VERSION) | gzip > osg-`date "+%Y%m%d"`.tar.gz)
 
 install instlinks instclean :
-	export OSGHOME=`pwd`; for f in $(DIRS)  ; do cd $$f; $(MAKE) $@; cd ..;  done
+	for f in $(DIRS)  ; do cd $$f; $(MAKE) $@; cd ..;  done
 
 instcheck :
 	diff -q include/osg/       /usr/include/osg/
diff --git a/src/Demos/Makefile b/src/Demos/Makefile
index 874ab474c..4197d754a 100644
--- a/src/Demos/Makefile
+++ b/src/Demos/Makefile
@@ -3,11 +3,11 @@ SHELL=/bin/sh
 
 DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews hangglide 
 
-# comment out if you don't have 
-#DIRS += osgcluster
-
 # comment out if you don't have the freetype and GLU1.3 library installed.
-#DIRS += osgtext 
+DIRS += osgtext 
+
+# comment out if you don't have support for networking.
+#DIRS += osgcluster
 
 # comment out if you don't have the wxWindows installed.
 # DIRS += wxsgv
diff --git a/src/Demos/hangglide/Makefile b/src/Demos/hangglide/Makefile
index 516c09dbc..e757dd1a8 100644
--- a/src/Demos/hangglide/Makefile
+++ b/src/Demos/hangglide/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	hangglide.cpp\
@@ -12,7 +12,7 @@ C++FILES = \
 	base.cpp\
 	trees.cpp\
 
-TARGET = $(TOP)/bin/hangglide
+TARGET = $(OSGHOME)/bin/hangglide
 
 TARGET_BIN_FILES = hangglide
 
@@ -22,7 +22,7 @@ TARGET_BIN_FILES = hangglide
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 # $(OSGDB_LIBS)
-C++FLAGS += -I. -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/Demos/osgcluster/Makefile b/src/Demos/osgcluster/Makefile
index 17f401bc1..72070556c 100644
--- a/src/Demos/osgcluster/Makefile
+++ b/src/Demos/osgcluster/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         broadcaster.cpp\
@@ -8,7 +8,7 @@ C++FILES = \
 
 C++FLAGS += -g 
 
-TARGET = $(TOP)/bin/osgcluster
+TARGET = $(OSGHOME)/bin/osgcluster
 
 TARGET_BIN_FILES = osgcluster
 
@@ -18,8 +18,8 @@ TARGET_BIN_FILES = osgcluster
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/Demos/osgconv/Makefile b/src/Demos/osgconv/Makefile
index 216c8cc8f..739ba36f4 100644
--- a/src/Demos/osgconv/Makefile
+++ b/src/Demos/osgconv/Makefile
@@ -1,12 +1,12 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgconv.cpp\
 	OrientationConverter.cpp
 
 
-TARGET = $(TOP)/bin/osgconv
+TARGET = $(OSGHOME)/bin/osgconv
 
 TARGET_BIN_FILES = osgconv
 
@@ -16,7 +16,7 @@ TARGET_BIN_FILES = osgconv
 #note, standard library list. 
 LIBS = -losgDB -losg $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/Demos/osgcube/Makefile b/src/Demos/osgcube/Makefile
index 9dc6634cc..70e7d5c13 100644
--- a/src/Demos/osgcube/Makefile
+++ b/src/Demos/osgcube/Makefile
@@ -1,15 +1,15 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgcube.cpp
 
-TARGET = $(TOP)/bin/osgcube
+TARGET = $(OSGHOME)/bin/osgcube
 
 TARGET_BIN_FILES = osgcube
 
 LIBS = -losgGLUT -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/Demos/osgimpostor/Makefile b/src/Demos/osgimpostor/Makefile
index e01ea6339..82f24eef6 100644
--- a/src/Demos/osgimpostor/Makefile
+++ b/src/Demos/osgimpostor/Makefile
@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgimpostor.cpp
 
-TARGET = $(TOP)/bin/osgimpostor
+TARGET = $(OSGHOME)/bin/osgimpostor
 
 TARGET_BIN_FILES = osgimpostor
 
@@ -14,8 +14,8 @@ TARGET_BIN_FILES = osgimpostor
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/Demos/osgreflect/Makefile b/src/Demos/osgreflect/Makefile
index ee0b63e7e..bf04d7fbf 100644
--- a/src/Demos/osgreflect/Makefile
+++ b/src/Demos/osgreflect/Makefile
@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgreflect.cpp \
 
-TARGET = $(TOP)/bin/osgreflect
+TARGET = $(OSGHOME)/bin/osgreflect
 
 TARGET_BIN_FILES = osgreflect
 
@@ -14,7 +14,7 @@ TARGET_BIN_FILES = osgreflect
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/Demos/osgtext/Makefile b/src/Demos/osgtext/Makefile
index 8b8d37fea..d4be5d9c8 100644
--- a/src/Demos/osgtext/Makefile
+++ b/src/Demos/osgtext/Makefile
@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	main.cpp
 
-TARGET = $(TOP)/bin/osgtext
+TARGET = $(OSGHOME)/bin/osgtext
 
 TARGET_BIN_FILES = osgtext
 
@@ -14,8 +14,8 @@ TARGET_BIN_FILES = osgtext
 #note, standard library list. 
 LIBS = -losgGLUT -losgText -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include -g
-LDFLAGS += -L$(TOP)/lib -L/usr/freeware/lib32
+C++FLAGS += -I$(OSGHOME)/include -g
+LDFLAGS += -L$(OSGHOME)/lib -L/usr/freeware/lib32
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/Demos/osgtexture/Makefile b/src/Demos/osgtexture/Makefile
index 89f21f369..7be1cf3bb 100644
--- a/src/Demos/osgtexture/Makefile
+++ b/src/Demos/osgtexture/Makefile
@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgtexture.cpp
 
-TARGET = $(TOP)/bin/osgtexture
+TARGET = $(OSGHOME)/bin/osgtexture
 
 TARGET_BIN_FILES = osgtexture
 
@@ -14,7 +14,7 @@ TARGET_BIN_FILES = osgtexture
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/Demos/osgviews/Makefile b/src/Demos/osgviews/Makefile
index 294a0361d..6792fd3ab 100644
--- a/src/Demos/osgviews/Makefile
+++ b/src/Demos/osgviews/Makefile
@@ -1,10 +1,10 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	osgviews.cpp
 
-TARGET = $(TOP)/bin/osgviews
+TARGET = $(OSGHOME)/bin/osgviews
 
 TARGET_BIN_FILES = osgviews
 
@@ -14,8 +14,8 @@ TARGET_BIN_FILES = osgviews
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/Demos/sgv/Makefile b/src/Demos/sgv/Makefile
index 006be087a..465fc4852 100644
--- a/src/Demos/sgv/Makefile
+++ b/src/Demos/sgv/Makefile
@@ -1,18 +1,18 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	sgv.cpp
 
-TARGET = $(TOP)/bin/sgv
+TARGET = $(OSGHOME)/bin/sgv
 
 TARGET_BIN_FILES = sgv
 
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/Demos/wxsgv/Makefile b/src/Demos/wxsgv/Makefile
index 12ba2ec01..70614391c 100644
--- a/src/Demos/wxsgv/Makefile
+++ b/src/Demos/wxsgv/Makefile
@@ -1,14 +1,14 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	$(wildcard *.cpp)
 
-TARGET = $(TOP)/bin/wxsgv
+TARGET = $(OSGHOME)/bin/wxsgv
 
 TARGET_BIN_FILES = wxsgv
 
-C++FLAGS += -I$(TOP)/include `wx-config --cflags`
+C++FLAGS += -I$(OSGHOME)/include `wx-config --cflags`
 
 #note, use this library list when using the Performer osgPlugin.
 #LIBS = ${PFLIBS} -losgWX -losgUtil -losgDB -losg \
@@ -20,8 +20,8 @@ LIBS = -losgWX -losgUtil -losgDB -losg \
        `wx-config --libs` -lwx_gtk_gl \
 	   $(GL_LIBS) $(X_LIBS)
 
-C++FLAGS += -I$(TOP)/include -I./icons
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I$(OSGHOME)/include -I./icons
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osg/Makefile b/src/osg/Makefile
index 501098aab..022904714 100644
--- a/src/osg/Makefile
+++ b/src/osg/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	AlphaFunc.cpp\
@@ -136,12 +136,12 @@ TARGET_INCLUDE_FILES = \
 
 LIBS    =  $(GL_LIBS)
 
-LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).a
+LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
+#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
 
-C++FLAGS += -I $(TOP)/include -DSG_LIBRARY
+C++FLAGS += -I $(OSGHOME)/include -DSG_LIBRARY
 
 #LDFLAGS += -Wl,--out-implib,./../lib/lib$(TARGET_BASENAME).a
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgDB/Makefile b/src/osgDB/Makefile
index c1f58570a..e1686d191 100644
--- a/src/osgDB/Makefile
+++ b/src/osgDB/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	DynamicLibrary.cpp\
@@ -39,15 +39,15 @@ TARGET_INCLUDE_FILES = \
 	osgDB/DotOsgWrapper\
 
 
-#LIBS    = -L$(TOP)/lib -losg -lGLU -lGL -lm -ldl
-LIBS    = -L$(TOP)/lib -losg $(GL_LIBS) $(DYNAMICLIBRARYLIB)
+#LIBS    = -L$(OSGHOME)/lib -losg -lGLU -lGL -lm -ldl
+LIBS    = -L$(OSGHOME)/lib -losg $(GL_LIBS) $(DYNAMICLIBRARYLIB)
 
-LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).a
+LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
+#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
 
-C++FLAGS += -I $(TOP)/include -DOSGDB_LIBRARY
+C++FLAGS += -I $(OSGHOME)/include -DOSGDB_LIBRARY
 
 #LDFLAGS += -Wl,--out-implib,./../lib/lib$(TARGET_BASENAME).a
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgGLUT/Makefile b/src/osgGLUT/Makefile
index 198e156e7..ee54d9654 100644
--- a/src/osgGLUT/Makefile
+++ b/src/osgGLUT/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	GLUTEventAdapter.cpp\
@@ -10,10 +10,10 @@ C++FILES = \
 TARGET_BASENAME = osgGLUT
 
 
-LIBS    = -L$(TOP)/lib -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS)
+LIBS    = -L$(OSGHOME)/lib -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS)
 
-LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).a
+LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
+#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 TARGET_INCLUDE_FILES = \
@@ -25,7 +25,7 @@ TARGET_INCLUDE_FILES = \
 	osgGLUT/glut\
 	
 
-C++FLAGS += -I $(TOP)/include -DOSGGLUT_LIBRARY
+C++FLAGS += -I $(OSGHOME)/include -DOSGGLUT_LIBRARY
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/bmp/Makefile b/src/osgPlugins/bmp/Makefile
index 5096562c4..f9a52f0a2 100644
--- a/src/osgPlugins/bmp/Makefile
+++ b/src/osgPlugins/bmp/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         ReaderWriterBMP.cpp\
@@ -8,14 +8,14 @@ TARGET_BASENAME = osgdb_bmp
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/dw/Makefile b/src/osgPlugins/dw/Makefile
index d26459924..79e39f031 100644
--- a/src/osgPlugins/dw/Makefile
+++ b/src/osgPlugins/dw/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = ReaderWriterDW.cpp
 
@@ -7,14 +7,14 @@ TARGET_BASENAME = osgdb_dw
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/flt/Makefile b/src/osgPlugins/flt/Makefile
index 0d8153381..d694340d2 100644
--- a/src/osgPlugins/flt/Makefile
+++ b/src/osgPlugins/flt/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	BoundingVolumeRecords.cpp\
@@ -47,15 +47,15 @@ TARGET_BASENAME = osgdb_flt
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
+C++FLAGS += -I. -I$(OSGHOME)/include 
 
-LDFLAGS += -L$(TOP)/lib
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/Makefile
index d804c71b9..4f672c656 100644
--- a/src/osgPlugins/gif/Makefile
+++ b/src/osgPlugins/gif/Makefile
@@ -1,19 +1,19 @@
 #!smake
-include ../../../Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         ReaderWriterGIF.cpp\
 
-LIB = ../../../lib/osgPlugins/osgdb_gif.$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/osgdb_gif.$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/osgdb_gif.$(SO_EXT)
 
 LIBS = -lungif
 
-C++FLAGS += -I. -I../../../include  -I/usr/freeware/include
-LDFLAGS += -L../../../lib $(FREEBSD_LOCALLIBS) -L/usr/freeware/lib32
+C++FLAGS += -I. -I$(OSGHOME)/include  -I/usr/freeware/include
+LDFLAGS += -L$(OSGHOME)/lib $(FREEBSD_LOCALLIBS) -L/usr/freeware/lib32
 
-include ../../../Make/makerules
+include $(OSGHOME)/Make/makerules
 
 
 
diff --git a/src/osgPlugins/jpeg/Makefile b/src/osgPlugins/jpeg/Makefile
index 5666c3f7c..c9c07e33c 100644
--- a/src/osgPlugins/jpeg/Makefile
+++ b/src/osgPlugins/jpeg/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         ReaderWriterJPEG.cpp\
@@ -9,13 +9,13 @@ TARGET_BASENAME = osgdb_jpg
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB -ljpeg
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/osgPlugins/lib3ds/Makefile b/src/osgPlugins/lib3ds/Makefile
index 4affe255a..340c09dff 100644
--- a/src/osgPlugins/lib3ds/Makefile
+++ b/src/osgPlugins/lib3ds/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         atmosphere.cpp \
@@ -27,16 +27,16 @@ TARGET_BASENAME = osgdb_3ds
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
 
 
diff --git a/src/osgPlugins/lwo/Makefile b/src/osgPlugins/lwo/Makefile
index 7416c7efb..ce56fef9f 100644
--- a/src/osgPlugins/lwo/Makefile
+++ b/src/osgPlugins/lwo/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = ReaderWriterLWO.cpp lw.cpp
 
@@ -7,13 +7,13 @@ TARGET_BASENAME = osgdb_lwo
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB -losgUtil
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/osgPlugins/obj/Makefile b/src/osgPlugins/obj/Makefile
index 5ac244145..edc3e3f17 100644
--- a/src/osgPlugins/obj/Makefile
+++ b/src/osgPlugins/obj/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = ReaderWriterOBJ.cpp glm.cpp
 
@@ -7,13 +7,13 @@ TARGET_BASENAME = osgdb_obj
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/Makefile
index be19f447a..90c2db6c4 100644
--- a/src/osgPlugins/osg/Makefile
+++ b/src/osgPlugins/osg/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         AlphaFunc.cpp\
@@ -45,16 +45,16 @@ TARGET_BASENAME = osgdb_osg
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
 
 
diff --git a/src/osgPlugins/osgtgz/Makefile b/src/osgPlugins/osgtgz/Makefile
index 1c2f350fc..ab4c3171c 100644
--- a/src/osgPlugins/osgtgz/Makefile
+++ b/src/osgPlugins/osgtgz/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	ReaderWriterOSGTGZ.cpp\
@@ -9,14 +9,14 @@ TARGET_BASENAME = osgdb_osgtgz
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/pic/Makefile b/src/osgPlugins/pic/Makefile
index 6f76606a2..8944bba88 100644
--- a/src/osgPlugins/pic/Makefile
+++ b/src/osgPlugins/pic/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         ReaderWriterPIC.cpp\
@@ -9,14 +9,14 @@ TARGET_BASENAME = osgdb_pic
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/Makefile
index 6a8e27954..59f1d0507 100644
--- a/src/osgPlugins/png/Makefile
+++ b/src/osgPlugins/png/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         ReaderWriterPNG.cpp\
@@ -10,13 +10,13 @@ TARGET_BASENAME = osgdb_png
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB -lpng
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
diff --git a/src/osgPlugins/rgb/Makefile b/src/osgPlugins/rgb/Makefile
index 13bfa7382..22eadab78 100644
--- a/src/osgPlugins/rgb/Makefile
+++ b/src/osgPlugins/rgb/Makefile
@@ -1,21 +1,21 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         ReaderWriterRGB.cpp\
 
 TARGET_BASENAME = osgdb_rgb
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
 
 
diff --git a/src/osgPlugins/tga/Makefile b/src/osgPlugins/tga/Makefile
index 8c26a2718..1a68bb616 100644
--- a/src/osgPlugins/tga/Makefile
+++ b/src/osgPlugins/tga/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
         ReaderWriterTGA.cpp\
@@ -9,14 +9,14 @@ TARGET_BASENAME = osgdb_tga
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/tgz/Makefile b/src/osgPlugins/tgz/Makefile
index 75a1310c3..27d362b5e 100644
--- a/src/osgPlugins/tgz/Makefile
+++ b/src/osgPlugins/tgz/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	ReaderWriterTGZ.cpp\
@@ -8,14 +8,14 @@ TARGET_BASENAME = osgdb_tgz
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/Makefile
index a9c5d1594..8d1cb677b 100644
--- a/src/osgPlugins/tiff/Makefile
+++ b/src/osgPlugins/tiff/Makefile
@@ -9,14 +9,14 @@ TARGET_BASENAME = osgdb_tiff
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB -ltiff
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgPlugins/zip/Makefile b/src/osgPlugins/zip/Makefile
index 20c357e08..02f460920 100644
--- a/src/osgPlugins/zip/Makefile
+++ b/src/osgPlugins/zip/Makefile
@@ -8,14 +8,14 @@ TARGET_BASENAME = osgdb_zip
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 
-LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
+LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 LIBS    =  $(GL_LIBS) -losg -losgDB
 
-C++FLAGS += -I. -I$(TOP)/include 
-LDFLAGS += -L$(TOP)/lib
+C++FLAGS += -I. -I$(OSGHOME)/include 
+LDFLAGS += -L$(OSGHOME)/lib
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgText/Makefile b/src/osgText/Makefile
index 2b53c4e85..018d91e44 100644
--- a/src/osgText/Makefile
+++ b/src/osgText/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	FTBitmapGlyph.cpp \
@@ -29,10 +29,10 @@ C++FILES = \
 TARGET_BASENAME = osgText
 
 
-LIBS    = -L$(TOP)/lib -lfreetype -losgDB -losg $(GL_LIBS)
+LIBS    = -L$(OSGHOME)/lib -lfreetype -losgDB -losg $(GL_LIBS)
 
-LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).a
+LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
+#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 TARGET_INCLUDE_FILES = \
@@ -42,7 +42,7 @@ TARGET_INCLUDE_FILES = \
 	osgText/Text\
 	osgText/Version
 
-C++FLAGS += -I$(TOP)/include \
+C++FLAGS += -I$(OSGHOME)/include \
 		-I/usr/include/freetype2 \
 		-I/usr/local/include \
 		-I/usr/local/include/freetype2  \
@@ -52,5 +52,5 @@ C++FLAGS += -I$(TOP)/include \
 
 LDFLAGS += -L/usr/local/lib -L/usr/freeware/lib32
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgUtil/Makefile b/src/osgUtil/Makefile
index 4eff37847..a73985c31 100644
--- a/src/osgUtil/Makefile
+++ b/src/osgUtil/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	AppVisitor.cpp\
@@ -35,10 +35,10 @@ C++FILES = \
 TARGET_BASENAME = osgUtil
 
 
-LIBS    = -L$(TOP)/lib -losg $(GL_LIBS)
+LIBS    = -L$(OSGHOME)/lib -losg $(GL_LIBS)
 
-LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).a
+LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
+#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 TARGET_INCLUDE_FILES = \
@@ -75,9 +75,9 @@ TARGET_INCLUDE_FILES = \
 	osgUtil/Version\
 
 
-C++FLAGS += -I $(TOP)/include -DOSGUTIL_LIBRARY
+C++FLAGS += -I $(OSGHOME)/include -DOSGUTIL_LIBRARY
 
-#LDFLAGS += --out-implib $(TOP)/lib/lib$(TARGET_BASENAME).a
+#LDFLAGS += --out-implib $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules
 
diff --git a/src/osgWX/Makefile b/src/osgWX/Makefile
index 6b28e378c..be30f30cc 100644
--- a/src/osgWX/Makefile
+++ b/src/osgWX/Makefile
@@ -1,5 +1,5 @@
 #!smake
-include $(TOP)/Make/makedefs
+include $(OSGHOME)/Make/makedefs
 
 C++FILES = \
 	WXEventAdapter.cpp\
@@ -7,10 +7,10 @@ C++FILES = \
 
 TARGET_BASENAME = osgWX
 
-LIBS    = -L$(TOP)/lib -losgDB -losgUtil -losg $(WXLIB) $(GL_LIBS)
+LIBS    = -L$(OSGHOME)/lib -losgDB -losgUtil -losg $(WXLIB) $(GL_LIBS)
 
-LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
-#LIB	= $(TOP)/lib/lib$(TARGET_BASENAME).a
+LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
+#LIB	= $(OSGHOME)/lib/lib$(TARGET_BASENAME).a
 
 TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
 TARGET_INCLUDE_FILES = \
@@ -18,7 +18,7 @@ TARGET_INCLUDE_FILES = \
 	osgWX/WXEventAdapter\
 	osgWX/Version\
 
-C++FLAGS += -I $(TOP)/include `wx-config --cflags`
+C++FLAGS += -I $(OSGHOME)/include `wx-config --cflags`
 
-include $(TOP)/Make/makerules
+include $(OSGHOME)/Make/makerules