--- Makefile.orig	Wed Aug  8 04:14:56 2001
+++ Makefile	Mon Sep 17 21:17:51 2001
@@ -1,8 +1,8 @@
-PREFIX=/usr/local
+PREFIX=/usr
 
 BINDIR=$(PREFIX)/bin
 LIBDIR=$(PREFIX)/lib/fte
-CONFIGDIR=$(LIBDIR)/config
+CONFIGDIR=/usr/share/fte
 
 .PHONY: all install
 
--- src/fte-unix.mak.orig	Tue Sep 18 00:17:42 2001
+++ src/fte-unix.mak	Tue Sep 18 00:18:34 2001
@@ -5,7 +5,7 @@
 
 #  vfte - for Linux console directly (with limitations, see con_linux.cpp)
 
-TARGETS = xfte vfte sfte
+TARGETS = @targets@
 #TARGETS = xfte
 
 PRIMARY = xfte
@@ -122,18 +122,18 @@
 
 #######################################################################
 
-#QTDIR   = /users/markom/qt
-#QLIBDIR  = -L$(QTDIR)/lib
-#QINCDIR  = -I$(QTDIR)/include
+QTDIR    = /usr/X11R6/lib/qt
+QLIBDIR  = -L$(QTDIR)/lib
+QINCDIR  = -I$(QTDIR)/include
 #QINCDIR  = -I/usr/include/qt
 
-MOC      = moc
+MOC      = /usr/X11R6/lib/qt/bin/moc
 
 LIBDIR   = 
 INCDIR   =
 
 #OPTIMIZE = -g # -O -g
-OPTIMIZE = -O2
+OPTIMIZE = @cflags@
 #OPTIMIZE = -O2 -s
 
 CCFLAGS  = $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR)
@@ -174,9 +174,9 @@
 	perl mkdefcfg.pl <defcfg.cnf >defcfg.h
 
 #DEFAULT_FTE_CONFIG = simple.fte
-DEFAULT_FTE_CONFIG = defcfg.fte
+#DEFAULT_FTE_CONFIG = defcfg.fte
 #DEFAULT_FTE_CONFIG = defcfg2.fte
-#DEFAULT_FTE_CONFIG = ../config/main.fte
+DEFAULT_FTE_CONFIG = ../config/main.fte
 
 defcfg.cnf: $(DEFAULT_FTE_CONFIG) cfte
 	./cfte $(DEFAULT_FTE_CONFIG) defcfg.cnf
@@ -184,8 +184,8 @@
 xfte: $(OBJS) $(XOBJS)
 	$(LD) $(LDFLAGS) $(OBJS) $(XOBJS) $(XLIBS) -o xfte
 
-#qfte: g_qt.moc g_qt_dlg.moc $(OBJS) $(QOBJS)
-#	$(LD) $(LDFLAGS) $(OBJS) $(QOBJS) $(QLIBS) $(XLIBS) -o qfte
+qfte: g_qt.moc g_qt_dlg.moc $(OBJS) $(QOBJS)
+	$(LD) $(LDFLAGS) $(OBJS) $(QOBJS) $(QLIBS) $(XLIBS) -o qfte
 
 vfte: $(OBJS) $(VOBJS)
 	$(LD) $(LDFLAGS) $(OBJS) $(VOBJS) $(VLIBS) -o vfte