$NetBSD: patch-ag,v 1.3 2003/07/17 09:01:03 adam Exp $

--- Imakefile.orig	2003-06-11 15:44:30.000000000 +0200
+++ Imakefile	2003-07-17 10:43:28.000000000 +0200
@@ -89,7 +89,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
 
@@ -124,10 +124,10 @@
 xaw::
 	-$(RM) $(XAW95DEPENDS)
 	echo "SYS_LIBRARIES = XawClientLibs -lm" > Local.xawdefs
-	xmkmf ; make
+	${XMKMF} ; make
 
 libXaw95.so:
-	cd xaw95-1.1.4 ; xmkmf -a ; make
+	cd xaw95-1.1.4 ; ${XMKMF} ; make
 	-$(RM) libXaw95.so libXaw95.a
 	-$(LN) xaw95-1.1.4/libXaw95.so libXaw95.so
 	-$(LN) xaw95-1.1.4/libXaw95.a libXaw95.a
@@ -138,13 +138,13 @@
 	-$(RM) $(XAW95DEPENDS)
 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
 	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
-	xmkmf ; make
+	${XMKMF} ; make
 
 xaw95static:: libXaw95.a
 	-$(RM) $(XAW95DEPENDS)
 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
-	echo "SYS_LIBRARIES = ./libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
-	xmkmf ; make
+	echo "SYS_LIBRARIES = ./xaw95-1.1.4/libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
+	${XMKMF} ; make
 
 clean::
 	-$(RM) preproc substads XPaint.ad XPaint.ad.h DefaultRC.txt.h PGP.*