--- Makefile.orig	Thu Nov 28 16:11:25 2002
+++ Makefile	Thu Nov 28 16:14:44 2002
@@ -13,22 +13,22 @@
 # QTDIR =       /usr/lib/qt
 
 # DESTDIR (location for installing)
-DESTDIR = /usr/local
+DESTDIR = ${PREFIX}/bin
 
 ####### Compiler, tools and options
 
-CC	=	gcc
-CXX	=	g++
-CFLAGS	=	-pipe -DNO_DEBUG
-CXXFLAGS=	-pipe -DNO_DEBUG -Wall -ansi
-INCPATH	=	-I$(QTDIR)/include
-LINK	=	g++
+#CC	=	gcc
+#CXX	=	g++
+CFLAGS	+=	-pipe -DNO_DEBUG
+CXXFLAGS+=	-pipe -DNO_DEBUG -Wall -ansi
+INCPATH	=	${QTCPPFLAGS}
+LINK	=	${CXX}
 LFLAGS	=	
-LIBS    =       $(SUBLIBS) -lqt
+LIBS    =       ${QTCFGLIBS} ${LIBQT}
 # you might try this if icemc segfaults when starting up:
 #LIBS	=	$(SUBLIBS) -lqt-mt
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
+#MOC	=	$(QTDIR)/bin/moc
+UIC	=	${X11BASE}/bin/uic
 
 TAR	=	tar -cf
 GZIP	=	gzip -9f