$NetBSD: patch-aa,v 1.3 2001/03/20 13:54:31 wiz Exp $

--- conf/NetBSD.mk.orig	Sun Dec 10 02:49:29 2000
+++ conf/NetBSD.mk	Wed Mar 14 06:37:28 2001
@@ -1,40 +1,30 @@
 INSTALL=install
 MAKEDEPEND=sh ../conf/mkdep.sh
-INCS_X11= -I/usr/X11R6/include
+INCS_X11= -I${X11BASE}/include
 
 # set ELFENV in config.mk
 # a.out env. -> 0
 # ELF env.   -> 1
-ifndef ELFENV
+#HF#
+#HF# Force -Wl,-rpath even on a.out
+#HF#ifndef ELFENV
 ELFENV=1
-endif
+#HF# endif
 
-ifeq (${ELFENV},1)
-LIBS_X11= -L/usr/X11R6/lib -Wl,-rpath,/usr/X11R6/lib -lX11
-else
-LIBS_X11= -L/usr/X11R6/lib -lX11
-endif
+LIBS_X11= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -lX11
 ifeq (${SUPPORT_X_KEYMOUSE},y)
 LIBS_X11 += -lXtst -lXext
 endif
 
-INCS_CONS= -I/usr/pkg/include
-ifeq (${ELFENV},1)
-    LIBS_CONS= -L/usr/pkg/lib -Wl,-rpath /usr/pkg/lib
-else
-    LIBS_CONS= -L/usr/pkg/lib
-endif
+INCS_CONS= -I${PREFIX}/include
+LIBS_CONS= -L${PREFIX}/lib -Wl,-rpath ${PREFIX}/lib
 
 ifndef LIBS_IM
-INCS_IM = -I/usr/pkg/include
-    ifeq (${ELFENV},1)
-    LIBS_IM = -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -lcanna
-    else
-    LIBS_IM = -L/usr/pkg/lib -lcanna
-    endif
+INCS_IM = -I${PREFIX}/include
+LIBS_IM = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lcanna
 endif
 
-SHLIB_CFLAGS=-fpic -DPIC
+SHLIB_CFLAGS=-fPIC -DPIC
 ifeq (${ELFENV},1)
     SHLIB_LDFLAGS = -shared
     SHLIB_LD=${CC}
@@ -65,18 +55,10 @@
 
 ifdef MGL_INSTALLED
 	INCS_MGL = -I${MGL_HEADER_DIR}
-	ifeq (${ELFENV},1)
-	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib  -lmgl2
-	else
-	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -L/usr/pkg/lib  -lmgl2	
-	endif
+	LIBS_MGL = -L${MGL_LIB_DIR} -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib  -lmgl2
 else
 	INCS_MGL = -I${SRCDIR}
-	ifeq (${ELFENV},1)
-	LIBS_MGL = -L${SRCDIR} -rdynamic -Wl,-rpath,/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -lmgl2 
-	else
-	LIBS_MGL = -L${SRCDIR} -L/usr/X11R6/lib -L/usr/pkg/lib -lmgl2 
-	endif
+	LIBS_MGL = -L${SRCDIR} -rdynamic -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib -lmgl2 
 endif
 
 ifneq (${ELFENV},1)