$NetBSD: patch-ac,v 1.3 2000/09/09 01:53:04 wiz Exp $

--- x11/Makefile.in.orig	Mon Jun 19 17:36:18 2000
+++ x11/Makefile.in
@@ -25,10 +25,10 @@
 krnsrcdir = $(srcdir)/../kernel
 
 GAMEUID = games
-GAMEGRP = bin
+GAMEGRP = games
 
-GAMEPERM = 04755
-DIRPERM  = 0755
+GAMEPERM = 02755
+DIRPERM  = 0775
 FILEPERM = 0644
 
 SHELL = /bin/sh
@@ -49,7 +49,7 @@
 
 #TCLTK_LIB = -ltk -ltcl -ldl -lm
 #TCLTK_LIB = ../tcl/unix/libtcl8.0.a ../tk/unix/libtk8.0.a -ldl -lm
-TCLTK_LIB = $(TCL) $(TK)
+TCLTK_LIB = $(TCL) $(TK) -Wl,-R$(libdir)
 
 # Extra flags that the TCLTK files need:
 TCLTK_CFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS)
@@ -65,14 +65,14 @@
 # This variable is needed when doing dynamic linking.
 LIB_RUNTIME_DIR = $(libdir)
 TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@
-TCL_CFLAGS = @TCLHDIR@
+TCL_CFLAGS = -I${LOCALBASE}/include
 TCL_DEPS =
 
 TCL_DL_LIBS = @TCL_DL_LIBS@
 
 # Tk stuff.
 TK = @TK_LIB_SPEC@
-TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@
+TK_CFLAGS = -I${LOCALBASE}/include @TK_BUILD_INCLUDES@
 TK_DEPS =
 
 X11_CFLAGS = @TK_XINCLUDES@
@@ -81,7 +81,7 @@
 
 GUI_CFLAGS_X = @GUI_CFLAGS_X@
 
-X11_LIB_FLAGS = @XLIBS@
+X11_LIB_FLAGS = @XLIBS@ -Wl,-R$(X11BASE)/lib
 
 # Override this to disable SelFile calls.
 
@@ -173,7 +173,7 @@
 
 X11_INCLUDE_FLAGS = @XINCLUDES@
 
-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir)  -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS)
+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir)  -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS) $(TCLTK_CFLAGS)
 
 .c.o:
 	$(CC) -c $(ALL_CFLAGS) $<
@@ -215,7 +215,7 @@
 	$(CC) -o imf2x $(ALL_CFLAGS) $(LDFLAGS) imf2x.o $(XUTOBJS) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(XAW_LIB) $(NET_EXTRA_LIBS)
 
 ximfapp:	ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB)
-	$(CC) -o ximfapp $(ALL_CFLAGS) $(LDFLAGS) ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(TCLTK_LIB) $(X11_LIB) $(NET_EXTRA_LIBS)
+	$(CC) -o ximfapp $(ALL_CFLAGS) $(LDFLAGS) ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(TCLTK_LIB) $(X11_LIB) $(NET_EXTRA_LIBS) -lm
 
 xshowimf:	xshowimf.o $(XUTOBJS) $(LOW_LIB)
 	$(CC) -o xshowimf $(ALL_CFLAGS) $(LDFLAGS) xshowimf.o $(XUTOBJS) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(SELFILE_LIB) $(XAW_LIB) $(NET_EXTRA_LIBS)