--- Makefile.orig	Fri Nov 26 13:11:08 1999
+++ Makefile	Fri Nov 26 13:11:11 1999
@@ -1,16 +1,17 @@
-INCLUDE = -I. -I$(QTDIR)/include -I$(HOME)/include -I./icons
-DESTLIB = $(HOME)/lib                                                              # where to put library
-LIB = -L/usr/X11R6/lib -L$(QTDIR)/lib -L$(DESTLIB)
-
-MOC 	= $(QTDIR)/bin/moc
-CC 	= g++
-C	= gcc
+QTDIR=	${X11BASE}
+INCLUDE = -I. -I$(QTDIR)/include -I$(QTDIR)/include/qt2 -I$(HOME)/include -I./icons
+DESTLIB = ${PREFIX}/lib
+LIB = -L${X11BASE}/lib -L${LOCALBASE}/lib -L$(QTDIR)/lib -L$(DESTLIB) -L.
+
+MOC 	= $(QTDIR)/bin/moc2
+#CC 	= g++
+#C	= gcc
 AR	= ar
 M	= moc_
 RM = rm -f
 KDOC = kdoc -H -d doc -e
 
-OPTIONS	= -g -ansi -fguiding-decls
+OPTIONS	= ${CFLAGS} -fguiding-decls -DFINEDIR=\""${PREFIX}/share/fine\""
 
 OBJ	= qsmartedit.o qcolormultilinedit.o undoredo.o qeditor.o qfontselect.o qcolordialog.o qcolorlistboxitem.o qkeyworddialog.o qhotkeydialog.o
 METAOBJ = qsmartedit.mo qcolormultilinedit.mo qeditor.mo qfontselect.mo qcolordialog.mo qkeyworddialog.mo qhotkeydialog.mo
@@ -35,14 +36,13 @@
 
 $(TARGET):	$(OBJ) $(METAOBJ)
 	$(AR) r $(TARGET) $(OBJ) $(METAOBJ)
-	mv $(TARGET) $(DESTLIB)
 
 %.o:	%.C	
-	$(CC) -c $(OPTIONS) $(INCLUDE) $<
+	$(CXX) -c $(OPTIONS) $(INCLUDE) $<
 
 %.mo:	%.h
 	$(MOC) $< -o $(subst .h,.C,$(M)$<)
-	$(CC) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,$(M)$<) -o $(subst .h,.mo,$<)
+	$(CXX) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,$(M)$<) -o $(subst .h,.mo,$<)
 
 fine:	fine.o fine.mo
-	$(CC) -g -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt -lX11 -lXext
+	$(CXX) -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt2 -lX11 -lXext