--- Makefile.orig	Mon Apr 19 18:51:04 1999
+++ Makefile	Sat May  1 17:17:30 1999
@@ -4,29 +4,31 @@
 
 ####### Installation directory
 
-XGLOBE_DIR     = /usr/local
+XGLOBE_DIR     = $(PREFIX)
 XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
 XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
 
 ####### Library directories - you may need to modify these
 
-X11_INCLUDE_DIR = /usr/X11R6/include
-QT_INCLUDE_DIR  = /usr/lib/qt/include
+X11_INCLUDE_DIR = $(X11BASE)/include
+QT_INCLUDE_DIR  = $(X11BASE)/share/include/X11/qt
 
-QT_LIB_DIR      = /usr/lib/qt/lib
-X11_LIB_DIR     = /usr/X11R6/lib
+QT_LIB_DIR      = $(X11BASE)/lib
+X11_LIB_DIR     = $(X11BASE)/lib
 
 
 ####### Compiler and tools
 
-CPP     = g++
-LINK    = g++
+CXX	?= g++
+CPP     = $(CXX)
+LINK    = $(CXX)
 MOC     = moc
 INSTALL = install
 
 ####### compile and link options
 
-CFLAGS       = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -O2 -Wall
+CFLAGS       ?= -O2
+CFLAGS       += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -Wall
 
 LFLAGS       =