--- Makefile.orig	Sat Aug 28 03:10:27 1999
+++ Makefile	Sat Nov 27 03:19:24 1999
@@ -2,24 +2,24 @@
 
 TARGET=xwmm
 
-INSTALLDIR=/usr/local
+INSTALLDIR=$(PREFIX)
 
-INCDIR	= -I./ -I/usr/include -I$(QTDIR)/include -I/usr/include/qt -I/usr/local/include/qt
+INCDIR	= -I./ -I/usr/include -I$(QTDIR)/include -I$(QTDIR)/include/qt2
 
 #CFLAGS	= -O2 -fno-strength-reduce -W -Wtemplate-debugging -Wparentheses \
 #	-Wuninitialized -Wchar-subscripts -Wformat -Wtrigraphs -Wcomment \
 #	-Wswitch -Wunused -Wreturn-type -Wimplicit -Wpointer-arith -Wsynth \
 #	-Wconversion -Wno-overloaded-virtual
-CFLAGS	= -ggdb -Wall -W -pipe
+#CFLAGS	= -ggdb -Wall -W -pipe
 #CFLAGS	= -O2 -Wall -W -pipe 
 
-LFLAGS  = -g -L/lib -L$(QTDIR)/lib -lqt -lm
+LFLAGS  = -g -L/lib -L$(QTDIR)/lib -lqt2 -lm -lxpg4
 ARFLAGS	= -crs
-CC	= g++
+CC	= $(CXX)
 AR	= ar
 FLEX 	= flex
 MAKE	= gmake
-MOC	= moc
+MOC	= $(QTDIR)/bin/moc2
 
 ####### Implicit rules