--- Makefile.orig	Sun Apr  4 01:59:09 1999
+++ Makefile	Sat May  8 00:50:27 1999
@@ -128,6 +128,7 @@
 		ModulesPrefPage.moc.o
 
 TARGET	=	qtarch
+INSTALLDIR	= ${PREFIX}
 
 
 include Makefile.common
@@ -160,7 +161,8 @@
 	@echo
 	@echo "Linking $(TARGET)"
 	@$(CC) $(OBJECTS) $(OBJMETA) -o $(TARGET) $(LFLAGS)
-
+	@echo 
+	@$(MAKE) -C module/kde
 
 efence: $(OBJECTS) $(OBJMETA) 
 efence: bmp_d prop_d widget_d layout_d pixmap_d
@@ -208,3 +210,5 @@
 doc:
 	@$(MAKE) -C doc doc
 
+
+include Makefile.install
--- Makefile.common.orig	Sat Apr  3 23:31:22 1999
+++ Makefile.common	Sat May  8 00:55:23 1999
@@ -5,10 +5,10 @@
 #endif
 
 ifndef QTDIR
-QTDIR	= /usr/local/lib/qt
+QTDIR	= ${X11BASE}
 endif
 
-INCDIR	= -I$(QTDIR)/include -I$(TOPDIR)
+INCDIR	= -I$(QTDIR)/include/X11/qt -I$(TOPDIR)
 #CFLAGS	= -O2 -fno-strength-reduce -W -Wtemplate-debugging -Wparentheses \
 #	-Wuninitialized -Wchar-subscripts -Wformat -Wtrigraphs -Wcomment \
 #	-Wswitch -Wunused -Wreturn-type -Wimplicit -Wpointer-arith -Wsynth \
@@ -26,9 +26,9 @@
 	bmp/libbmp.a \
 	layout/liblayout.a \
 	pixmap/libpixmap.a \
-	-lfl -lqt -lstdc++ -ldl -rdynamic
+	-lfl -lqt -lstdc++ -lX11 -lm -rdynamic
 ARFLAGS	= -crs
-CC	= g++
+CC	= $(CXX)
 AR	= ar
 FLEX	= flex
 MAKE	= gmake
--- bmp/Makefile.orig	Fri Jan 29 04:41:35 1999
+++ bmp/Makefile	Sat May  8 00:50:27 1999
@@ -85,7 +85,7 @@
 include ../Makefile.common
 
 qembed: qembed.o
-	$(CC) qembed.o -o qembed -L$(QTDIR)/lib -lqt 
+	$(CC) qembed.o -o qembed -L$(QTDIR)/lib -lqt -lX11
 
 $(BMPSOURCE): $(BMPS) qembed
 	./qembed $(BMPHEADER) $(BMPSOURCE) $(BMPS)
--- module/kde/Makefile.orig	Sun Apr  4 06:03:24 1999
+++ module/kde/Makefile	Sat May  8 01:01:42 1999
@@ -1,4 +1,4 @@
-INCDIR = -I$(QTDIR)/include -I../.. -I/opt/kde/include
+INCDIR = -I$(X11BASE)/include/X11/qt -I../.. -I$(PREFIX)/include
 
 ifdef BUILD_RELEASE
 CFLAGS = -O2 -fno-strength-reduce -Wall -W -pipe -fPIC
@@ -6,8 +6,8 @@
 CFLAGS = -g -Wall -W -pipe -fPIC
 endif
 
-LDFLAGS = -g -shared -L$(QTDIR)/lib -L/opt/kde/lib -lqt -lkdecore -lkdeui
-CC = g++
+LDFLAGS = -g -shared -L$(X11BASE)/lib -L$(PREFIX)/lib -lqt -lkdecore -lkdeui
+CC = $(CXX)
 MOC = moc
 QTARCHBIN = ../../qtarch