$NetBSD: patch-aa,v 1.4 2003/08/30 22:24:32 jmmv Exp $

--- Makefile.in.orig	2003-06-06 16:48:46.000000000 +0200
+++ Makefile.in
@@ -51,7 +51,7 @@ INSTALL_DATA=@INSTALL_DATA@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
-DMDIR=@DMDIR@
+DMDIR=@prefix@/share/examples/wdm
 GFXDIR=@GFXDIR@
 MANDIR=@mandir@
 PAMDIR=@PAMDIR@
@@ -70,15 +70,12 @@ install-bin: $(DESTDIR)$(bindir)/wdm $(D
 
 all-config: configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig
 
-install-config: $(DESTDIR)$(DMDIR)/GiveConsole $(DESTDIR)$(DMDIR)/TakeConsole $(DESTDIR)$(DMDIR)/Xaccess $(DESTDIR)$(DMDIR)/Xresources $(DESTDIR)$(DMDIR)/Xservers.fs $(DESTDIR)$(DMDIR)/Xsession.XFree86 $(DESTDIR)$(DMDIR)/Xsession.orig $(DESTDIR)$(DMDIR)/Xclients $(DESTDIR)$(DMDIR)/Xservers $(DESTDIR)$(DMDIR)/Xservers.ws $(DESTDIR)$(DMDIR)/Xsession $(DESTDIR)$(DMDIR)/Xsetup_0 $(DESTDIR)$(DMDIR)/wdm-config $(DESTDIR)$(DMDIR)/wdmReconfig $(DESTDIR)$(DMDIR)/wdm-config.in $(DESTDIR)$(DMDIR)/Xclients.in install-pam-$(USE_PAM) $(DESTDIR)$(DMDIR)/authdir
+install-config: $(DESTDIR)$(DMDIR)/GiveConsole $(DESTDIR)$(DMDIR)/TakeConsole $(DESTDIR)$(DMDIR)/Xaccess $(DESTDIR)$(DMDIR)/Xresources $(DESTDIR)$(DMDIR)/Xservers.fs $(DESTDIR)$(DMDIR)/Xsession.XFree86 $(DESTDIR)$(DMDIR)/Xsession.orig $(DESTDIR)$(DMDIR)/Xclients $(DESTDIR)$(DMDIR)/Xservers $(DESTDIR)$(DMDIR)/Xservers.ws $(DESTDIR)$(DMDIR)/Xsession $(DESTDIR)$(DMDIR)/Xsetup_0 $(DESTDIR)$(DMDIR)/wdm-config $(DESTDIR)$(DMDIR)/wdmReconfig $(DESTDIR)$(DMDIR)/wdm-config.in $(DESTDIR)$(DMDIR)/Xclients.in install-pam-$(USE_PAM)
 
 install-pam-no:
 
 install-pam-yes: $(DESTDIR)$(PAMDIR)/wdm
 
-$(DESTDIR)$(DMDIR)/authdir:
-	$(INSTALL) -m 700 -D -d $@
-
 all-doc: doc/wdm.man
 
 all-nls-yes: po/de.mo po/ja.mo po/ru.mo
@@ -191,21 +188,21 @@ bin/TestLogin: src/TestLogin/TestLogin.o
 	$(CC) $(TestLogin_ldflags) src/TestLogin/TestLogin.o $(TestLogin_libs) -o bin/TestLogin
 
 $(DESTDIR)$(bindir)/TestLogin: bin/TestLogin
-	$(INSTALL_PROGRAM) -D bin/TestLogin $@
+	$(INSTALL_PROGRAM) bin/TestLogin $@
 
 bin/wdm: src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/streams.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o bin/libwdm.a
 	mkdir -p bin
 	$(CC) $(wdm_ldflags) src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/streams.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o $(wdm_libs) -o bin/wdm
 
 $(DESTDIR)$(bindir)/wdm: bin/wdm
-	$(INSTALL_PROGRAM) -D bin/wdm $@
+	$(INSTALL_PROGRAM) bin/wdm $@
 
 bin/wdmLogin: src/wdmLogin/Login.o src/wdmLogin/config.o bin/libwdm.a
 	mkdir -p bin
 	$(CC) $(wdmLogin_ldflags) src/wdmLogin/Login.o src/wdmLogin/config.o $(wdmLogin_libs) -o bin/wdmLogin
 
 $(DESTDIR)$(bindir)/wdmLogin: bin/wdmLogin
-	$(INSTALL_PROGRAM) -D bin/wdmLogin $@
+	$(INSTALL_PROGRAM) bin/wdmLogin $@
 
 bin/libwdm.a: src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
 	mkdir -p bin
@@ -213,140 +210,140 @@ bin/libwdm.a: src/libwdm/debug.o src/lib
 	$(ranlib) bin/libwdm.a
 
 $(DESTDIR)$(MANDIR)/man1/wdmLogin.1: doc/wdmLogin.man
-	$(INSTALL_DATA) -D doc/wdmLogin.man $@
+	$(INSTALL_DATA) doc/wdmLogin.man $@
 
 doc/wdm.man: doc/wdm.man.in
 	CONFIG_FILES=$@:doc/wdm.man.in CONFIG_HEADERS= ./config.status
 
 $(DESTDIR)$(MANDIR)/man1/wdm.1: doc/wdm.man
-	$(INSTALL_DATA) -D doc/wdm.man $@
+	$(INSTALL_DATA) doc/wdm.man $@
 
 $(DESTDIR)$(GFXDIR)/Eagle.xpm: pixmaps/Eagle.xpm
-	$(INSTALL_DATA) -D pixmaps/Eagle.xpm $@
+	$(INSTALL_DATA) pixmaps/Eagle.xpm $@
 
 $(DESTDIR)$(GFXDIR)/Earth.jpg: pixmaps/Earth.jpg
-	$(INSTALL_DATA) -D pixmaps/Earth.jpg $@
+	$(INSTALL_DATA) pixmaps/Earth.jpg $@
 
 $(DESTDIR)$(GFXDIR)/Earth200x130.xpm: pixmaps/Earth200x130.xpm
-	$(INSTALL_DATA) -D pixmaps/Earth200x130.xpm $@
+	$(INSTALL_DATA) pixmaps/Earth200x130.xpm $@
 
 $(DESTDIR)$(GFXDIR)/GnuLinux-logo.jpg: pixmaps/GnuLinux-logo.jpg
-	$(INSTALL_DATA) -D pixmaps/GnuLinux-logo.jpg $@
+	$(INSTALL_DATA) pixmaps/GnuLinux-logo.jpg $@
 
 $(DESTDIR)$(GFXDIR)/Stars.jpg: pixmaps/Stars.jpg
-	$(INSTALL_DATA) -D pixmaps/Stars.jpg $@
+	$(INSTALL_DATA) pixmaps/Stars.jpg $@
 
 $(DESTDIR)$(GFXDIR)/StarsLogo.jpg: pixmaps/StarsLogo.jpg
-	$(INSTALL_DATA) -D pixmaps/StarsLogo.jpg $@
+	$(INSTALL_DATA) pixmaps/StarsLogo.jpg $@
 
 $(DESTDIR)$(GFXDIR)/gnuLogo.xpm: pixmaps/gnuLogo.xpm
-	$(INSTALL_DATA) -D pixmaps/gnuLogo.xpm $@
+	$(INSTALL_DATA) pixmaps/gnuLogo.xpm $@
 
 po/de.mo: po/de.po
 	$(msgfmt) -o $@ po/de.po
 
 $(DESTDIR)$(NLSDIR)/de/LC_MESSAGES/wdm.mo: po/de.mo
-	$(INSTALL_DATA) -D po/de.mo $@
+	$(INSTALL_DATA) po/de.mo $@
 
 po/ja.mo: po/ja.po
 	$(msgfmt) -o $@ po/ja.po
 
 $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo: po/ja.mo
-	$(INSTALL_DATA) -D po/ja.mo $@
+	$(INSTALL_DATA) po/ja.mo $@
 
 po/ru.mo: po/ru.po
 	$(msgfmt) -o $@ po/ru.po
 
 $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo: po/ru.mo
-	$(INSTALL_DATA) -D po/ru.mo $@
+	$(INSTALL_DATA) po/ru.mo $@
 
 $(DESTDIR)$(DMDIR)/GiveConsole: configs/GiveConsole
-	$(INSTALL) -m 0755 -D configs/GiveConsole $@
+	$(INSTALL) -m 0755 configs/GiveConsole $@
 
 
 $(DESTDIR)$(DMDIR)/TakeConsole: configs/TakeConsole
-	$(INSTALL) -m 0755 -D configs/TakeConsole $@
+	$(INSTALL) -m 0755 configs/TakeConsole $@
 
 
 $(DESTDIR)$(DMDIR)/Xaccess: configs/Xaccess
-	$(INSTALL) -m 0644 -D configs/Xaccess $@
+	$(INSTALL) -m 0644 configs/Xaccess $@
 
 
 $(DESTDIR)$(DMDIR)/Xresources: configs/Xresources
-	$(INSTALL) -m 0644 -D configs/Xresources $@
+	$(INSTALL) -m 0644 configs/Xresources $@
 
 
 $(DESTDIR)$(DMDIR)/Xservers.fs: configs/Xservers.fs
-	$(INSTALL) -m 0644 -D configs/Xservers.fs $@
+	$(INSTALL) -m 0644 configs/Xservers.fs $@
 
 
 $(DESTDIR)$(DMDIR)/Xsession.XFree86: configs/Xsession.XFree86
-	$(INSTALL) -m 0755 -D configs/Xsession.XFree86 $@
+	$(INSTALL) -m 0755 configs/Xsession.XFree86 $@
 
 
 $(DESTDIR)$(DMDIR)/Xsession.orig: configs/Xsession.orig
-	$(INSTALL) -m 0644 -D configs/Xsession.orig $@
+	$(INSTALL) -m 0644 configs/Xsession.orig $@
 
 
 configs/Xclients: configs/Xclients.in
 	CONFIG_FILES=$@:configs/Xclients.in CONFIG_HEADERS= ./config.status
 
 $(DESTDIR)$(DMDIR)/Xclients: configs/Xclients
-	$(INSTALL) -m 0755 -D configs/Xclients $@
+	$(INSTALL) -m 0755 configs/Xclients $@
 
 
 configs/Xservers: configs/Xservers.in
 	CONFIG_FILES=$@:configs/Xservers.in CONFIG_HEADERS= ./config.status
 
 $(DESTDIR)$(DMDIR)/Xservers: configs/Xservers
-	$(INSTALL) -m 0644 -D configs/Xservers $@
+	$(INSTALL) -m 0644 configs/Xservers $@
 
 
 configs/Xservers.ws: configs/Xservers.ws.in
 	CONFIG_FILES=$@:configs/Xservers.ws.in CONFIG_HEADERS= ./config.status
 
 $(DESTDIR)$(DMDIR)/Xservers.ws: configs/Xservers.ws
-	$(INSTALL) -m 0644 -D configs/Xservers.ws $@
+	$(INSTALL) -m 0644 configs/Xservers.ws $@
 
 
 configs/Xsession: configs/Xsession.in
 	CONFIG_FILES=$@:configs/Xsession.in CONFIG_HEADERS= ./config.status
 
 $(DESTDIR)$(DMDIR)/Xsession: configs/Xsession
-	$(INSTALL) -m 0755 -D configs/Xsession $@
+	$(INSTALL) -m 0755 configs/Xsession $@
 
 
 configs/Xsetup_0: configs/Xsetup_0.in
 	CONFIG_FILES=$@:configs/Xsetup_0.in CONFIG_HEADERS= ./config.status
 
 $(DESTDIR)$(DMDIR)/Xsetup_0: configs/Xsetup_0
-	$(INSTALL) -m 0755 -D configs/Xsetup_0 $@
+	$(INSTALL) -m 0755 configs/Xsetup_0 $@
 
 
 configs/wdm-config: configs/wdm-config.in
 	CONFIG_FILES=$@:configs/wdm-config.in CONFIG_HEADERS= ./config.status
 
 $(DESTDIR)$(DMDIR)/wdm-config: configs/wdm-config
-	$(INSTALL) -m 0600 -D configs/wdm-config $@
+	$(INSTALL) -m 0600 configs/wdm-config $@
 
 
 configs/wdmReconfig: configs/wdmReconfig.in
 	CONFIG_FILES=$@:configs/wdmReconfig.in CONFIG_HEADERS= ./config.status
 
 $(DESTDIR)$(DMDIR)/wdmReconfig: configs/wdmReconfig
-	$(INSTALL) -m 0755 -D configs/wdmReconfig $@
+	$(INSTALL) -m 0755 configs/wdmReconfig $@
 
 
 $(DESTDIR)$(PAMDIR)/wdm: configs/wdm.pamd
-	$(INSTALL) -m 0644 -D configs/wdm.pamd $@
+	$(INSTALL) -m 0644 configs/wdm.pamd $@
 
 
 $(DESTDIR)$(DMDIR)/wdm-config.in: configs/wdm-config.in
-	$(INSTALL) -m 0644 -D configs/wdm-config.in $@
+	$(INSTALL) -m 0644 configs/wdm-config.in $@
 
 
 $(DESTDIR)$(DMDIR)/Xclients.in: configs/Xclients.in
-	$(INSTALL) -m 0644 -D configs/Xclients.in $@
+	$(INSTALL) -m 0644 configs/Xclients.in $@
 
 
 
