--- Makefile.orig	Mon Jul 19 05:56:27 1999
+++ Makefile	Fri Aug 27 16:06:08 1999
@@ -4,29 +4,30 @@
 
 ####### Installation directory
 
-XGLOBE_DIR     = /usr/local
-XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
+XGLOBE_DIR     = $(PREFIX)
+XGLOBE_LIB_DIR = $(XGLOBE_DIR)/share/xglobe
 XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
 
 ####### Library directories - you may need to modify these
 
-X11_INCLUDE_DIR = /usr/X11R6/include
-QT_INCLUDE_DIR  = $(QTDIR)/include
+X11_INCLUDE_DIR = $(X11BASE)/include
+QT_INCLUDE_DIR  = $(X11BASE)/include/X11/qt
 
-QT_LIB_DIR      = $(QTDIR)/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    ?= c++
+CPP     = ${CXX} 
+LINK    = ${CXX} 
 MOC     = moc
 INSTALL = install
 
 ####### compile and link options
 
-CFLAGS       = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) -O2 -Wall
+CFLAGS       += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO)
 
 LFLAGS       =