--- Makefile.orig	Mon Jun 25 12:03:07 2001
+++ Makefile	Sun Jul  1 20:47:36 2001
@@ -3,12 +3,12 @@
 #
 
 DESTDIR =
-GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Temperature.app
-X11_BINDIR = /usr/X11R6/bin
+GNUSTEP_BINDIR = $(X11BASE)/GNUstep/Apps/Temperature.app
+X11_BINDIR = $(X11BASE)/bin
 
 CXX=c++
-CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
-LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
+CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(X11BASE)/include
+LDFLAGS += -L$(X11BASE)/lib -lXpm -lXext -lX11
 
 OBJECTS = Main.o Temperature.o Xpm.o