diff -Nurd -x'*~' xpaint-2.7.0.orig/Imakefile xpaint-2.7.0/Imakefile
--- xpaint-2.7.0.orig/Imakefile	2003-06-11 09:44:30.000000000 -0400
+++ xpaint-2.7.0/Imakefile	2003-10-28 13:25:44.000000000 -0500
@@ -9,6 +9,7 @@
 #include "./Local.xawdefs"
 
 DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES) $(XPM_INCLUDE) \
+          -I@PREFIX@/include \
           "-DEDITOR=\"$(EDITOR)\"" \
           "-DSHAREDIR=\"$(SHAREDIR)\"" \
           "-DXAPPLOADDIR=\"$(XAPPLOADDIR)\"" \
@@ -89,7 +90,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) -ldl
 
 SUBDIRS = rw
 
@@ -103,7 +104,6 @@
 # Other targets...
 
 all::
-	if test "$(XAWLIB_DEFINES)" = "" ; then cat xaw95-1.1.4/INFO_XAW95 ; fi
 
 install::
 	mkdir -p $(DESTDIR)$(SHAREDIR)/include
@@ -140,6 +140,12 @@
 	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
 	xmkmf ; make
 
+xaw3d::
+	-$(RM) $(XAW95DEPENDS)
+	echo "XAWLIB_DEFINES = " > Local.xawdefs
+	echo "SYS_LIBRARIES = -lXaw3d -lX11 -lXt -lXext -L@PREFIX@/lib -L/usr/X11R6/lib" >> Local.xawdefs
+	xmkmf ; make
+
 xaw95static:: libXaw95.a
 	-$(RM) $(XAW95DEPENDS)
 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
diff -Nurd -x'*~' xpaint-2.7.0.orig/Local.config xpaint-2.7.0/Local.config
--- xpaint-2.7.0.orig/Local.config	2003-06-03 08:56:41.000000000 -0400
+++ xpaint-2.7.0/Local.config	2003-10-28 13:25:44.000000000 -0500
@@ -8,8 +8,8 @@
 
 XCOMM Local customization
 
-DESTDIR = 
-SHAREDIR = /usr/share/xpaint
+DESTDIR = @DESTDIR@
+SHAREDIR = @PREFIX@/share/xpaint
 
 PRINT_COMMAND = lpr -Plp
 EDITOR = emacs -fn 9x15 -cr green -ms red -bg lightyellow -fg black
@@ -132,10 +132,10 @@
 XCOMM Uncomment these lines and tailor to taste, if you don't like
 XCOMM the default paths and man page extension.
 XCOMM
-XCOMM BINDIR = /usr/local/bin
-XCOMM MANDIR = /usr/local/man
-XCOMM #undef ManSuffix
-XCOMM #define ManSuffix 1
+BINDIR = @PREFIX@/bin
+MANDIR = @PREFIX@/share/man/man1
+#undef ManSuffix
+#define ManSuffix 1
 
 XCOMM Add '-g' here if you want to include debugging information.
 XCOMM Also add any optimizer flags etc. that you want.
@@ -167,3 +167,14 @@
 JPEG_LIB     = -L/usr/local/lib -ljpeg
 XPM_INCLUDE = -I/usr/X11R6/include/X11
 #endif
+
+ARCH_DEFINES = -DHAVE_PARAM_H
+TIFF_INCLUDE = -I@PREFIX@/include
+TIFF_LIB     = -L@PREFIX@/lib -ltiff
+JPEG_INCLUDE = -I@PREFIX@/include
+JPEG_LIB     = -L@PREFIX@/lib -ljpeg
+PNG_LIB      = -lpng -lz
+PNG_INCLUDE  = -I@PREFIX@/include
+XPM_INCLUDE  = -I/usr/X11R6/include/X11
+
+XAPPLOADDIR   = @PREFIX@/etc/app-defaults
diff -Nurd -x'*~' xpaint-2.7.0.orig/misc.h xpaint-2.7.0/misc.h
--- xpaint-2.7.0.orig/misc.h	2003-04-06 12:13:13.000000000 -0400
+++ xpaint-2.7.0/misc.h	2003-10-28 13:25:44.000000000 -0500
@@ -16,22 +16,6 @@
 #define USE_DRAND
 #endif
 
-#if defined(SVR4) || defined(__osf__)
-#define SHORT_RANGE
-#else
-#if !defined(__GLIBC__) & !defined(random) & !defined(__CYGWIN__)
-long random(void);
-#endif
-
-#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__)
-#if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
-void srandom(unsigned int);
-#else
-int srandom(unsigned int);
-#endif	/* BSD4_4 */
-#endif	/* linux */
-#endif
-
 #ifdef USE_DRAND
 #ifdef DECLARE_DRAND48
 extern double drand48();
diff -Nurd -x'*~' xpaint-2.7.0.orig/xpaint.man.in xpaint-2.7.0/xpaint.man.in
--- xpaint-2.7.0.orig/xpaint.man.in	2002-11-02 17:22:39.000000000 -0500
+++ xpaint-2.7.0/xpaint.man.in	2003-10-28 13:26:46.000000000 -0500
@@ -1,6 +1,6 @@
 .\" $Id: xpaint.man.in,v 1.4 1997/09/03 19:31:07 torsten Exp $
 .\" 
-.TH xpaint l "Release XPAINT_VERSION"
+.TH xpaint 1 "Release XPAINT_VERSION"
 .SH NAME
 xpaint \- Simple Paint program
 .SH SYNOPSIS