--- pi-address-0.3.3/Makefile	Sun Jan  9 13:43:25 2000
+++ pi-address-0.3.3/Makefile.new	Sun Jan  9 13:45:17 2000
@@ -5,7 +5,8 @@
 
 # be sure to set all include directories to correct values
 #  (especially the directory for the pilot-link and Qt include files)
-INCDIRS= -I$(XINCLUDE) -I/usr/X11R6/include/qt -I/usr/include/libpisock
+PILOT_LINK=/usr
+INCDIRS= -I$(XINCLUDE) -I$(QTDIR)/include -I$(PILOT_LINK)/include
 
 # DEBUG = -g -D_DEBUG_
 OPTIMIZE = -O2
@@ -20,15 +21,15 @@
 # try this one if you want to link against the shared library of pilot-link
 # (edit LFLAGS_PISOCK_DIR and/or LFLAGS_QT_DIR and uncomment if libs are not 
 #  in a standard directory)
-# LFLAGS_PISOCK_DIR = -L/usr/lib
-LFLAGS_QT_DIR = -L/usr/X11R6/lib
+LFLAGS_PISOCK_DIR = -L$(PILOT_LINK)/lib
+LFLAGS_QT_DIR = -L$(QTDIR)/lib
 LFLAGS = $(LFLAGS_ADD) $(LFLAGS_QT_DIR) -lqt $(LFLAGS_PISOCK_DIR) -lpisock
 
 # uncomment the following line on HP-UX
 # LFLAGS += -lX11 -lXext
 
 CC = g++
-MOC = moc
+MOC = $(QTDIR)/bin/moc
 SHELL =	/bin/sh
 
 INSTALL = /usr/bin/install
@@ -93,7 +94,7 @@
 $(TARGET): $(METASRC) $(OBJECTS)
 	$(CC) $(OBJECTS) $(LFLAGS) -o $(TARGET)
 
-install: all install-bin install-doc
+install: all install-bin
 
 install-bin: all
 	$(INSTALL) -d $(prefix)/bin $(conf_prefix)