$NetBSD: patch-ac,v 1.4 2001/12/11 15:37:05 jlam Exp $ --- Local.config.orig Wed Apr 1 02:58:05 1998 +++ Local.config @@ -62,8 +62,8 @@ #define HaveTIFF #ifdef HaveTIFF -TIFF_LIB = -L/usr/local/lib -ltiff -TIFF_INCLUDE = -I/usr/local/include/tiff +TIFF_LIB = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -ltiff +TIFF_INCLUDE = -I${BUILDLINK_DIR}/include #endif XCOMM If you have the JPEG library, make HaveJPEG defined @@ -73,8 +73,8 @@ #define HaveJPEG #ifdef HaveJPEG -JPEG_LIB = -L/usr/local/lib -ljpeg -JPEG_INCLUDE = -I/usr/local/include/jpeg +JPEG_LIB = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -ljpeg +JPEG_INCLUDE = -I${BUILDLINK_DIR}/include #endif XCOMM If you have the PNG library, make HavePNG defined @@ -84,8 +84,8 @@ #define HavePNG #ifdef HavePNG -PNG_LIB = -L/usr/local/lib -lpng -lz -PNG_INCLUDE = -I/usr/local/include/png +PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -lpng -lz +PNG_INCLUDE = -I${BUILDLINK_DIR}/include #endif XCOMM If you are running SunOS and get an error with the following undefined @@ -102,11 +102,11 @@ 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 = -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/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${BUILDLINK_DIR}/include/X11 DEPENDFLAGS = -I./bitmaps @@ -114,10 +114,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}/man/cat1 +#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. @@ -138,9 +138,9 @@ #if defined(FreeBSDArchitecture) || 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 +TIFF_INCLUDE = -I${BUILDLINK_DIR}/include +TIFF_LIB = -Wl,-R${LOCALBASE} -L${BUILDLINK_DIR}/lib -ltiff +JPEG_INCLUDE = -I${BUILDLINK_DIR}/include +JPEG_LIB = -Wl,-R${LOCALBASE} -L${BUILDLINK_DIR}/lib -ljpeg +XPM_INCLUDE = -I${BUILDLINK_DIR}/include/X11 #endif