--- CONFIG.orig	Mon Aug 31 23:33:16 1998
+++ CONFIG	Tue Dec 22 17:41:13 1998
@@ -4,9 +4,9 @@
 
 #            *************** PACKAGE LOCATIONS ***********
 #Define if you don't already have the ENV variable
-QTDIR = /usr/local/qt
+QTDIR = ${X11BASE}
 KDE_DIR = /opt/kde
-X11_DIR = /usr/X11R6
+X11_DIR = ${X11BASE}
 #            *********************************************
 
 
@@ -45,7 +45,7 @@
 #TIME=time -p
 
 #make location
-MAKE = $(TIME) make
+#MAKE = $(TIME) make
 
 #moc Location
 MOC = @$(QTDIR)/bin/moc
@@ -74,8 +74,12 @@
 HOSTOSVER = $(shell, uname -r)
 
 #Compiler Flags
-CFLAGS = $(FORCE_DYN) $(ULTRA_BETA) -D_OS_=$(HOSTOSTYPE) -I$(X11_DIR)/include/X11 -I$(QTDIR)/include #-g
+CFLAGS = $(FORCE_DYN) $(ULTRA_BETA) -D_OS_=$(HOSTOSTYPE) -I$(X11_DIR)/include/X11 -I$(X11BASE)/include/X11/qt -I$(X11BASE)/include
+ifeq ($(PORTOBJFORMAT),elf)
+LFLAGS = -Wl,-rpath,$(X11BASE)/lib -L$(QTDIR)/lib -lqt -L$(X11_DIR)/lib -lX11
+else
 LFLAGS = -L$(QTDIR)/lib -lqt -L$(X11_DIR)/lib -lX11
+endif
 
 #Flex configs
 ifdef LEX_LIB_LOC
