From b5b40b6c35427a115d314b1cade6e4953d58a761 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Fri, 2 Jan 2004 17:19:51 +0000
Subject: [PATCH] Define CHOOSERPATH to /usr/X11R6/libexec/chooser, and use
 appropriately.

---
 x11/bin/xdm/Makefile         | 7 +++++--
 x11/bin/xdm/Makefile.xdm     | 4 +++-
 x11/bin/xdm/chooser/Makefile | 5 ++---
 x11/bin/xdm/config/Makefile  | 6 +++++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/x11/bin/xdm/Makefile b/x11/bin/xdm/Makefile
index 3e6510ba10e8..445e783309ca 100644
--- a/x11/bin/xdm/Makefile
+++ b/x11/bin/xdm/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/12/20 01:22:39 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2004/01/02 17:19:51 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -23,7 +23,6 @@ CPPFLAGS.resource.c=	\
 	-DDEF_SYSTEM_SHELL=\"/bin/sh\" \
 	-DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \
 	-DDEF_XDM_CONFIG=\"${X11LIBDIR}/xdm/xdm-config\" \
-	-DDEF_CHOOSER=\"${X11LIBDIR}/xdm/chooser\" \
 	-DDEF_AUTH_DIR=\"${X11LIBDIR}/xdm\" \
 	-DDEF_GREETER_LIB=\"${X11LIBDIR}/xdm/libXdmGreet.so\"
 
@@ -44,6 +43,10 @@ SUBDIR=		chooser config sessreg
 
 .include "Makefile.xdm"
 
+CPPFLAGS.resource.c+=	-DDEF_CHOOSER=\"${CHOOSERPATH}\"
+X11EXTRAMANDEFS+=	-DCHOOSERPATH=${CHOOSERPATH}
+SYMLINKS+=		${CHOOSERPATH} ${X11LIBDIR}/xdm/chooser
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>
diff --git a/x11/bin/xdm/Makefile.xdm b/x11/bin/xdm/Makefile.xdm
index fc9b41c80db8..adcd24cc5896 100644
--- a/x11/bin/xdm/Makefile.xdm
+++ b/x11/bin/xdm/Makefile.xdm
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xdm,v 1.1.1.1 2003/09/12 02:52:11 lukem Exp $
+#	$NetBSD: Makefile.xdm,v 1.2 2004/01/02 17:19:51 lukem Exp $
 
 CPPFLAGS+=	-DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${X11LIBDIR}/xdm\" \
 		-DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \
@@ -7,4 +7,6 @@ CPPFLAGS+=	-DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${X11LIBDIR}/xdm\" \
 		-I${X11SRCDIR.xc}/programs/xdm \
 		${X11FLAGS.VERSION}
 
+CHOOSERPATH=	${X11ROOTDIR}/libexec/chooser
+
 .PATH:		${X11SRCDIR.xc}/programs/xdm
diff --git a/x11/bin/xdm/chooser/Makefile b/x11/bin/xdm/chooser/Makefile
index 55b558992157..ee69a3e5c1f6 100644
--- a/x11/bin/xdm/chooser/Makefile
+++ b/x11/bin/xdm/chooser/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:16 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2004/01/02 17:19:51 lukem Exp $
 
 NOMAN=	1
 
@@ -6,8 +6,6 @@ NOMAN=	1
 
 PROG=	chooser
 
-BINDIR=	${X11LIBDIR}/xdm
-
 CPPFLAGS.chooser.c=	-DBSD44SOCKETS
 
 APPDEFS=Chooser.ad
@@ -19,4 +17,5 @@ DPADD+=	${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
 .include "../Makefile.xdm"
 
 .include <bsd.x11.mk>
+BINDIR=	${CHOOSERPATH:H}
 .include <bsd.prog.mk>
diff --git a/x11/bin/xdm/config/Makefile b/x11/bin/xdm/config/Makefile
index 2cfe2484dfce..4d79598c380e 100644
--- a/x11/bin/xdm/config/Makefile
+++ b/x11/bin/xdm/config/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:50 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2004/01/02 17:19:51 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -26,5 +26,9 @@ BUILDSYMLINKS=	Xres.cpp Xresources.cpp \
 
 .PATH:		${X11SRCDIR.xc}/programs/xdm/config
 
+.include "../Makefile.xdm"
+
+CPPSCRIPTFLAGS_xdm-config+=	-DCHOOSERPATH=${CHOOSERPATH}
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>