blob: b248c6e86eafa242705e5f29aadfe1194c35dc5b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
$NetBSD: patch-ab,v 1.3 2003/11/06 16:22:28 agc Exp $
--- Imakefile.orig 1998-08-18 10:51:04.000000000 +0100
+++ Imakefile 2003-11-06 16:14:00.000000000 +0000
@@ -4,7 +4,7 @@
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
#undef XDMDIR
-XDMDIR=$(X11BASE)/share/xdm3d
+XDMDIR=$(PREFIX)/share/xdm3d
#ifndef BuildChooser
#define BuildChooser !SystemV
@@ -135,7 +135,7 @@
SUBDIRS = $(GREET_DIR) $(XDMCONFIGDIR)
INCLUDES = $(KRB5_INCLUDE)
-DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) $(DEPXAUTHLIB) $(DEPXDMCPLIB)
+DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB) $(XAUTHLIB) $(XDMCPLIB) $(RPCLIB) $(DLLIBRARY) $(CRYPT_LIBRARIES)
SRCS1 = auth.c daemon.c server.c dpylist.c dm.c error.c file.c \
@@ -155,7 +155,7 @@
#if BuildChooser
SRCS3 = chooser.c
OBJS3 = chooser.o
- DEPLIBS3 = XawClientDepLibs XkbClientDepLibs $(DEPXDMCPLIB)
+ DEPLIBS3 = XawClientDepLibs XkbClientDepLibs
LIBS3 = XawClientLibs XkbClientLibs $(XDMCPLIB)
#endif
@@ -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)"' \
|
