$NetBSD: patch-af,v 1.9 2004/11/03 15:54:31 adam Exp $

--- Local.config.orig	2004-09-05 08:14:53.000000000 +0000
+++ Local.config
@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.29 2004/09/0
 XCOMM Local customization
 
 DESTDIR = 
-SHAREDIR = /usr/share/xpaint
+SHAREDIR = $${X11PREFIX}/share/xpaint
 
 XCOMM Printing system defaults
 PRINT_COMMAND = lpr
@@ -70,6 +70,9 @@ XCOMM #endif
 
 #ifdef NetBSDArchitecture
 ARCH_DEFINES = -DHAVE_PARAM_H  
+#ifdef arm32Architecture
+CDEBUGFLAGS =
+#endif
 #endif
 
 #ifdef OS2Architecture
@@ -132,11 +135,11 @@ XCOMM
 XCOMM  You must have the XPM library.
 XCOMM  Make sure the path name to the library is correct.
 
-XPM_LIB     = -L/usr/X11R6/lib -lXpm
+XPM_LIB     = -L${XPMDIR}/lib -Wl,-R${XPMDIR}/lib -lXpm 
 
 XCOMM  Make sure this points to the location of the 'xpm.h' file.
 
-XPM_INCLUDE = -I/usr/X11R6/include/X11
+XPM_INCLUDE = -I${XPMDIR}/include/X11
 
 
 DEPENDFLAGS = -I./bitmaps
@@ -162,14 +165,14 @@ XCOMM CDEBUGFLAGS =
 
 XCOMM This should take care of everything needed for BSD.
 
-#if defined(NetBSDArchitecture) || defined(BSD386Architecture)
 ARCH_DEFINES = -DHAVE_PARAM_H
-TIFF_INCLUDE = -I/usr/local/include
-TIFF_LIB     = -L/usr/local/lib -ltiff
-JPEG_INCLUDE = -I/usr/local/include
-JPEG_LIB     = -L/usr/local/lib -ljpeg
-XPM_INCLUDE = -I/usr/X11R6/include/X11
-#endif
+TIFF_INCLUDE = -I${LOCALBASE}/include
+TIFF_LIB     = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltiff
+JPEG_INCLUDE = -I${LOCALBASE}/include
+JPEG_LIB     = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg
+PNG_INCLUDE = -I${LOCALBASE}/include/png
+PNG_LIB     = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpng -lz
+XPM_INCLUDE = -I${XPMDIR}/include/X11
 
 #if defined(FreeBSDArchitecture)
 ARCH_DEFINES = -DHAVE_PARAM_H