--- Imakefile.orig	Mon Mar 14 05:42:26 2005
+++ Imakefile	Mon Mar 14 20:22:16 2005
@@ -101,7 +101,7 @@
 #endif
 
 DEPLIBS = always xpaint.man XPaint.ad
-LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -ldl -rdynamic
+LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB)
 
 SUBDIRS = rw
 
@@ -163,7 +163,7 @@
 
 xaw3d::
 	-$(RM) $(XAW3DDEPENDS)
-	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw3d xaw_incdir	
+	-$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw3d xaw_incdir	
 	echo "XAWLIB_DEFINES = -DXAW3D" > Local.xawdefs
 	echo "SYS_LIBRARIES = -lXaw3d -L." >> Local.xawdefs
 	xmkmf ; cd rw ; xmkmf ; cd .. ; make
@@ -219,7 +219,7 @@
 		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
 		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
 		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
-	cp -p app-defaults/out/XPaint XPaint.ad
+	cp -f app-defaults/out/XPaint XPaint.ad
 
 XPaint.ad.h:	XPaint.ad
 	./substads -ad2c $? $@
