$NetBSD: patch-ab,v 1.2 2001/03/20 13:54:31 wiz Exp $ --- conf/config.mk-netbsd-i386-x.orig Sun Dec 10 02:49:30 2000 +++ conf/config.mk-netbsd-i386-x Wed Mar 14 06:41:48 2001 @@ -1,15 +1,15 @@ # MGLDIR : mgl direcory (headers,libs,shared objects,fonts ..) -MGLDIR=/usr/local/lib/mgl2 +MGLDIR=${PREFIX}/lib/mgl2 # MGL_SBIN_DIR mgl server directory -MGL_SBIN_DIR=/usr/local/sbin -MGL_BIN_DIR=/usr/local/bin +MGL_SBIN_DIR=${PREFIX}/sbin +MGL_BIN_DIR=${PREFIX}/bin # set MGL_HEADER_DIR to specify header direcotry -MGL_HEADER_DIR=/usr/local/include +MGL_HEADER_DIR=${PREFIX}/include # set MGL_LIB_DIR to specify library direcotry -MGL_LIB_DIR=/usr/local/lib +MGL_LIB_DIR=${PREFIX}/lib ifndef MGL_HEADER_DIR MGL_HEADER_DIR = ${MGLDIR} @@ -36,7 +36,7 @@ SUPPORT_CLIENT=y # server option -SERVER_X11 = mglsvrx +SERVER_X11 = mglsvrcons OBJS_X11=emx11.o #SERVER_CONS = mglsvrcons #OBJS_CONS=emcons.o @@ -58,22 +58,26 @@ # im option input-method #IM_STATIC=y IM_DYNAMIC=y -IM_PROG=imcanna.so +#IM_PROG=imcanna.so + +# nine +GP_DYNAMIC=y +PATCH_YY_BUF_SIZE=y # mil options USE_JPEG = -DUSE_JPEG -JPEGINCDIR = -I/usr/pkg/include -JPEGLIBDIR = -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib +JPEGINCDIR = -I${PREFIX}/include +JPEGLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib JPEGLIB = -ljpeg USE_GIF = -DUSE_GIF -GIFINCDIR = -I/usr/pkg/include -GIFLIBDIR = -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib +GIFINCDIR = -I${PREFIX}/include +GIFLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib GIFLIB = -lungif -#USE_PNG = -DUSE_PNG -#PNGINCDIR = -I/usr/pkg/include -#PNGLIBDIR = -L/usr/pkg/lib -#PNGLIB = -lpng +USE_PNG = -DUSE_PNG +PNGINCDIR = -I${PREFIX}/include +PNGLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib +PNGLIB = -lpng OSTYPE=NetBSD