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
55
56
|
$NetBSD: patch-aj,v 1.3 2006/01/18 23:53:06 xtraeme Exp $
--- programs/xdm/Imakefile.orig 2005-12-06 12:35:11.000000000 +0100
+++ programs/xdm/Imakefile 2005-12-06 12:38:07.000000000 +0100
@@ -107,7 +107,7 @@ PWD_DEFINES = -DUSESHADOW -DSHADOWSUITE
#endif
#endif
-#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture)
+#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture) && !defined(DragonFlyArchitecture)
SYS_LIBRARIES3 = -lresolv
#endif
#if SystemV || defined(SequentArchitecture)
@@ -208,6 +208,13 @@ LIFREQ_FLAGS = -Xa
#endif
#endif
+XDMLOGDIR = $(LOGDIRECTORY)
+#ifdef VarRunDirectory
+XDMPIDDIR = $(VARRUNDIR)
+#else
+XDMPIDDIR = $(XDMDIR)
+#endif
+
SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2) $(SYS_LIBRARIES3)
XDMCONFIGDIR = XdmConfigurationSubdirectory
@@ -265,7 +272,8 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB)
#endif
PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW)
- CHOOSERPATH = $(XDMDIR)/chooser
+ CHOOSERPATH = $(BINDIR)/chooser
+ GREETERLIBPATH = $(USRLIBDIR)/libXdmGreet.so
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
CONN_DEFINES = $(CONNECTION_FLAGS)
@@ -282,7 +290,8 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB)
EXTRAMANDEFS = $(RANDOM_DEFINES) -DCHOOSERPATH=$(CHOOSERPATH) \
-DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \
-DXDMDIR=$(XDMDIR) -DBINDIR=$(BINDIR) \
-
+ -DGREETERLIBPATH=$(GREETERLIBPATH) \
+ -DXDMAUTHDIR=$(XDMVARDIR)
XCOMM
XCOMM Special definitions for compiling default resources; these parameters
@@ -331,7 +340,7 @@ SpecialCObjectRule(daemon,$(ICONFIGFILES
#if BuildChooser
SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS))
NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
-InstallProgram(chooser,$(XDMDIR))
+InstallProgram(chooser,$(BINDIR))
InstallAppDefaults(Chooser)
#endif
#if BuildBoth
|
