$NetBSD: patch-ab,v 1.2 2002/03/20 01:52:31 wiz Exp $ --- Imakefile.orig Tue Aug 18 16:51:04 1998 +++ Imakefile Sun Dec 23 11:46:41 2001 @@ -4,7 +4,7 @@ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' #undef XDMDIR -XDMDIR=$(X11BASE)/share/xdm3d +XDMDIR=$(PREFIX)/share/xdm3d #ifndef BuildChooser #define BuildChooser !SystemV @@ -202,18 +202,18 @@ XCOMM XCOMM Do NOT change these lines! XCOMM -DEF_SERVER = $(BINDIR)/X +DEF_SERVER = $(X11BASE)/bin/X DEF_USER_PATH = DefaultUserPath /* no leading spaces or imake will */ DEF_SYSTEM_PATH = DefaultSystemPath /* indent as rule */ BOURNE_SHELL = DefaultSystemShell #ifndef OS2Architecture RES_DEFINES = '-DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0"' \ - '-DXRDB_PROGRAM="$(BINDIR)/xrdb"' \ - '-DDEF_SESSION="$(BINDIR)/xterm -ls"' \ + '-DXRDB_PROGRAM="$(X11BASE)/bin/xrdb"' \ + '-DDEF_SESSION="$(X11BASE)/bin/xterm -ls"' \ '-DDEF_USER_PATH="$(DEF_USER_PATH)"' \ '-DDEF_SYSTEM_PATH="$(DEF_SYSTEM_PATH)"' \ '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \ - '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \ + '-DDEF_FAILSAFE_CLIENT="$(X11BASE)/bin/xterm"' \ '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \ '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \ '-DDEF_AUTH_DIR="$(XDMDIR)"' \