--- Makefile.orig	Fri May  2 03:21:48 2003
+++ Makefile	Mon May 12 15:32:38 2003
@@ -26,13 +26,13 @@
 
 # GNU
 
-cpp = g++ -c -g -O5 -Wall -pedantic -Iinclude
+cpp = $(CXX) -c $(CXXFLAGS) -pedantic -Iinclude
 # To link with the static library libtcl.*.a
-link = g++ -lm
+link = $(CXX) -lm $(LDFLAGS)
 # To link with the shared object libtcl.*.so
 # link = g++ -lm -Wl,-brtl -bbigtoc
 # To link shared object
-linkShared = g++ -lm -Wl,-shared
+linkShared = $(CXX) -lm -Wl,-shared $(LDFLAGS)
 
 # xlC
 
@@ -47,15 +47,15 @@
 
 # Tcl/Tk Release
 
-libtcl = 8.3
-libtk = 8.3
+libtcl = 83
+libtk = 83
 
 
 # System Installation
 
-goblin_include_path = /usr/include
-goblin_lib_path     = /usr/lib
-goblin_bin_path     = /usr/bin
+goblin_include_path = $(PREFIX)/include
+goblin_lib_path     = $(PREFIX)/lib
+goblin_bin_path     = $(PREFIX)/bin
 
 
 #------------------------------------------------------------------------
@@ -683,7 +683,7 @@
 
 shared:	$(objects) goshMain.o goshGraph.o goshLin.o message.o
 	$(linkShared) $(objects) goshMain.o goshGraph.o goshLin.o message.o \
-        -lpthread -o libgoblin.so 
+        -o libgoblin.so 
 
 
 
@@ -691,7 +691,7 @@
 
 gosh:	goblin $(gosh_objects)
 	$(link) $(gosh_objects) goblin.a \
-        -lpthread -ltcl$(libtcl) -ltk$(libtk) -o gosh
+        -ltcl$(libtcl) -ltk$(libtk) -o gosh
 
 
 
