Updated to version 1.22.1.

Changes:

- install to location similar to xdm
- added rc.d script
- added MESSAGE with post-install instructions
- cleanups

1.22.1:
=======
- There was a bug. I forgot to change pam service name
  from xdm to wdm. This release fixes it.

1.22:
=====
- xdm-base upgraded to xdm from XFree86-4.2.1.
- wdmLogin translated to russian and japanese.

Now, what will be in next releases:
- compatibility with ancient versions of WINGs
  will be dropped.
- configuration files will be changed to PropList
  format (If you want to arue, mail me or chat with me at
  #wdm on irc.ornet.ru, or #windowmaker on irc.freenode.net)
- wdm <-> wdmLogin protocol will be changed to implement
  better PAM support.

1.21:
=====
- development started again. This release collects almost
  all patches I can find on net. If you have more patches
  please send them.
- directories rearranged, build system rewritten (see
  README.voins for explanations).
- everything is ready to start migration to newer xdm base.

7 files changed, 319 insertions, 60 deletions

diff --git a/x11/wdm/DESCR b/x11/wdm/DESCR
index 4800195dc71..12b3e792811 100644
--- a/x11/wdm/DESCR
+++ b/x11/wdm/DESCR
@@ -1,4 +1,4 @@
 wdm is a modification of XFree86's xdm package for graphically handling
 authentication and system login. Most of xdm has been preserved (XFree86
-3.3.2.3) with the Login interface based on a WINGs implementation using Tom
-Rothamel's "external greet" interface.
+4.2.1.1) with the Login interface based on a WINGs implementation using
+Tom Rothamel's "external greet" interface.
diff --git a/x11/wdm/MESSAGE b/x11/wdm/MESSAGE
new file mode 100644
index 00000000000..35cac08a1f1
--- /dev/null
+++ b/x11/wdm/MESSAGE
@@ -0,0 +1,18 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/02/23 17:33:31 salo Exp $
+
+To use wdm, you will need to perform the following steps:
+
+1. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy
+   ${PREFIX}/etc/rc.d/wdm to /etc/rc.d/wdm and add the following
+   line into your /etc/rc.conf
+
+	wdm=YES
+
+2. Stop all other display managers (e.g. xdm, gdm, ...) and disable them
+   in /etc/rc.conf.
+
+3. Start wdm by issuing the command
+
+	/etc/rc.d/wdm start
+===========================================================================
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index bf164ed76a2..0c6dbc15197 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,24 +1,38 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/07 21:18:33 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/23 17:33:31 salo Exp $
 
-DISTNAME=		wdm-1.20
+DISTNAME=		wdm-1.22.1
 CATEGORIES=		x11
-MASTER_SITES=		http://www.tcscs.com/wdm/wdm/
+MASTER_SITES=		http://voins.program.ru/wdm/
 
 MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.tcscs.com/wdm/
+HOMEPAGE=		http://voins.program.ru/wdm/
 COMMENT=		WINGs display manager
 
+BUILD_USES_MSGFMT=	YES
+
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-gfx-incs=${BUILDLINK_DIR}/include/WINGs \
-			--with-gfx-libs=${BUILDLINK_DIR}/lib
 
-INSTALL_TARGET=		install-strip
+CONFIGURE_ARGS+=	--with-wdmdir=${WDM_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
+CONFIGURE_ARGS+=	--with-gfx-incs=${BUILDLINK_DIR}/include/WINGs
+CONFIGURE_ARGS+=	--with-gfx-libs=${BUILDLINK_DIR}/lib
+
+RCD_SCRIPTS=		wdm
+
+WDM_SYSCONFDIR=		${PREFIX}/lib/X11/wdm
 
-WDM_AUTHDIR=		${PREFIX}/etc/wdm/authdir
-WDM_EXTRADIR1=		${WDM_AUTHDIR}/authdir
-WDM_EXTRADIR2=		${WDM_EXTRADIR1}/authfiles
+OWN_DIRS_PERMS+=	${WDM_SYSCONFDIR}/authdir/authfiles		\
+			${ROOT_USER} ${ROOT_GROUP} 700
+OWN_DIRS_PERMS+=	${WDM_SYSCONFDIR}/authdir/authdir		\
+			${ROOT_USER} ${ROOT_GROUP} 700
+OWN_DIRS_PERMS=		${WDM_SYSCONFDIR}/authdir			\
+			${ROOT_USER} ${ROOT_GROUP} 700
+OWN_DIRS=		${WDM_SYSCONFDIR}
+
+.include "../../mk/bsd.prefs.mk"
 
 # User may define WDM_MANAGERS option to specfy a window manager
 # different from WindowMaker. WDM_MANAGERS is a space-separated
@@ -27,15 +41,10 @@ WDM_EXTRADIR2=		${WDM_EXTRADIR1}/authfiles
 CONFIGURE_ARGS+=	--with-winmgr=${WMANAGER}
 .endfor
 
-post-install:
-	${MKDIR} ${WDM_EXTRADIR1}
-	${CHMOD} 700 ${WDM_EXTRADIR1}
-	${MKDIR} ${WDM_EXTRADIR2}
-	${CHMOD} 700 ${WDM_EXTRADIR2}
-
-.include "../../wm/windowmaker/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../wm/windowmaker/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wdm/PLIST b/x11/wdm/PLIST
index a1c5707e500..38cdc55b815 100644
--- a/x11/wdm/PLIST
+++ b/x11/wdm/PLIST
@@ -1,40 +1,31 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/07 21:18:33 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/23 17:33:31 salo Exp $
 bin/wdm
 bin/wdmLogin
-etc/wdm/GiveConsole
-etc/wdm/TakeConsole
-etc/wdm/Xaccess
-etc/wdm/Xclients
-etc/wdm/Xclients.in
-etc/wdm/Xresources
-etc/wdm/Xservers
-etc/wdm/Xservers.fs
-etc/wdm/Xservers.ws
-etc/wdm/Xsession
-etc/wdm/Xsession.XFree86
-etc/wdm/Xsession.in
-etc/wdm/Xsetup_0
-etc/wdm/pixmaps/Eagle.xpm
-etc/wdm/pixmaps/Earth.jpg
-etc/wdm/pixmaps/Earth200x130.xpm
-etc/wdm/pixmaps/GnuLinux-logo.jpg
-etc/wdm/pixmaps/README
-etc/wdm/pixmaps/Stars.jpg
-etc/wdm/pixmaps/StarsLogo.jpg
-etc/wdm/pixmaps/gnuLogo.xpm
-etc/wdm/wdm-config
-etc/wdm/wdm-config.in
-etc/wdm/wdmReconfig
+lib/X11/wdm/GiveConsole
+lib/X11/wdm/TakeConsole
+lib/X11/wdm/Xaccess
+lib/X11/wdm/Xclients
+lib/X11/wdm/Xclients.in
+lib/X11/wdm/Xresources
+lib/X11/wdm/Xservers
+lib/X11/wdm/Xservers.fs
+lib/X11/wdm/Xservers.ws
+lib/X11/wdm/Xsession
+lib/X11/wdm/Xsession.XFree86
+lib/X11/wdm/Xsession.orig
+lib/X11/wdm/Xsetup_0
+lib/X11/wdm/pixmaps/Eagle.xpm
+lib/X11/wdm/pixmaps/Earth.jpg
+lib/X11/wdm/pixmaps/Earth200x130.xpm
+lib/X11/wdm/pixmaps/GnuLinux-logo.jpg
+lib/X11/wdm/pixmaps/Stars.jpg
+lib/X11/wdm/pixmaps/StarsLogo.jpg
+lib/X11/wdm/pixmaps/gnuLogo.xpm
+lib/X11/wdm/wdm-config
+lib/X11/wdm/wdm-config.in
+lib/X11/wdm/wdmReconfig
 man/man1/wdm.1
 man/man1/wdmLogin.1
-@exec ${MKDIR} %D/etc/wdm/authdir
-@exec ${CHMOD} 700 %D/etc/wdm/authdir
-@exec ${MKDIR} %D/etc/wdm/authdir/authdir
-@exec ${CHMOD} 700 %D/etc/wdm/authdir/authdir
-@exec ${MKDIR} %D/etc/wdm/authdir/authdir/authfiles
-@exec ${CHMOD} 700 %D/etc/wdm/authdir/authdir/authfiles
-@dirrm etc/wdm/pixmaps
-@dirrm etc/wdm/authdir/authdir/authfiles
-@dirrm etc/wdm/authdir/authdir
-@dirrm etc/wdm/authdir
-@dirrm etc/wdm
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wdm.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/wdm.mo
+@dirrm lib/X11/wdm/pixmaps
diff --git a/x11/wdm/distinfo b/x11/wdm/distinfo
index b2adef20387..ec8c3d50152 100644
--- a/x11/wdm/distinfo
+++ b/x11/wdm/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/07 21:18:33 cjep Exp $
+$NetBSD: distinfo,v 1.2 2003/02/23 17:33:31 salo Exp $
 
-SHA1 (wdm-1.20.tar.gz) = 3bfcc0808b7426811748b127affb850bc3f1944b
-Size (wdm-1.20.tar.gz) = 411464 bytes
+SHA1 (wdm-1.22.1.tar.gz) = 4e97779487c6bac8017b26862ace9b90495baa82
+Size (wdm-1.22.1.tar.gz) = 511546 bytes
+SHA1 (patch-aa) = 3d4956a38be407b7e8b09d7270864cf51e59b22e
diff --git a/x11/wdm/files/wdm.sh b/x11/wdm/files/wdm.sh
new file mode 100644
index 00000000000..3c1a079be6a
--- /dev/null
+++ b/x11/wdm/files/wdm.sh
@@ -0,0 +1,20 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: wdm.sh,v 1.1 2003/02/23 17:33:31 salo Exp $
+#
+
+# PROVIDE: wdm
+# REQUIRE: DAEMON LOGIN wscons
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="wdm"
+rcvar=$name
+command="@PREFIX@/bin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="@PREFIX@/lib/X11/wdm/wdm-config"
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/x11/wdm/patches/patch-aa b/x11/wdm/patches/patch-aa
new file mode 100644
index 00000000000..fcceb243f95
--- /dev/null
+++ b/x11/wdm/patches/patch-aa
@@ -0,0 +1,220 @@
+$NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo Exp $
+
+--- Makefile.in.orig	2003-02-20 21:57:53.000000000 +0100
++++ Makefile.in	2003-02-23 17:21:11.000000000 +0100
+@@ -63,10 +63,13 @@
+ 
+ all: all-bin all-doc all-config all-nls
+ 
+-install: install-bin install-config install-doc install-gfx install-nls
++install: install-dir install-bin install-config install-doc install-gfx install-nls
+ 
+ all-bin: bin/TestLogin bin/wdm bin/wdmLogin
+ 
++install-dir:
++	${BSD_INSTALL_DATA_DIR} ${DMDIR}/pixmaps
++
+ install-bin: $(DESTDIR)$(bindir)/wdm $(DESTDIR)$(bindir)/wdmLogin
+ 
+ 
+@@ -79,7 +82,7 @@
+ install-pam-yes: $(DESTDIR)$(PAMDIR)/wdm
+ 
+ $(DESTDIR)$(DMDIR)/authdir:
+-	$(INSTALL) -m 700 -D -d $@
++	$(INSTALL) -m 700 -d $@
+ 
+ all-doc: doc/wdm.man
+ 
+@@ -174,160 +177,160 @@
+ 	$(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/error.o src/wdm/file.o src/wdm/genauth.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
+ 	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/error.o src/wdm/file.o src/wdm/genauth.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
+ 	mkdir -p bin
+ 	$(CC) $(wdmLogin_ldflags) src/wdmLogin/Login.o $(wdmLogin_libs) -o bin/wdmLogin
+ 
+ $(DESTDIR)$(bindir)/wdmLogin: bin/wdmLogin
+-	$(INSTALL_PROGRAM) -D bin/wdmLogin $@
++	$(INSTALL_PROGRAM) bin/wdmLogin $@
+ 
+ $(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 $@
+ 
+ include/Eagle.xpm: pixmaps/Eagle.xpm
+ 	ln -s ../pixmaps/Eagle.xpm $@
+ 
+ $(DESTDIR)$(DMDIR)/pixmaps/Eagle.xpm: pixmaps/Eagle.xpm
+-	$(INSTALL_DATA) -D pixmaps/Eagle.xpm $@
++	$(INSTALL_DATA) pixmaps/Eagle.xpm $@
+ 
+ $(DESTDIR)$(DMDIR)/pixmaps/Earth.jpg: pixmaps/Earth.jpg
+-	$(INSTALL_DATA) -D pixmaps/Earth.jpg $@
++	$(INSTALL_DATA) pixmaps/Earth.jpg $@
+ 
+ include/Earth200x130.xpm: pixmaps/Earth200x130.xpm
+ 	ln -s ../pixmaps/Earth200x130.xpm $@
+ 
+ $(DESTDIR)$(DMDIR)/pixmaps/Earth200x130.xpm: pixmaps/Earth200x130.xpm
+-	$(INSTALL_DATA) -D pixmaps/Earth200x130.xpm $@
++	$(INSTALL_DATA) pixmaps/Earth200x130.xpm $@
+ 
+ $(DESTDIR)$(DMDIR)/pixmaps/GnuLinux-logo.jpg: pixmaps/GnuLinux-logo.jpg
+-	$(INSTALL_DATA) -D pixmaps/GnuLinux-logo.jpg $@
++	$(INSTALL_DATA) pixmaps/GnuLinux-logo.jpg $@
+ 
+ $(DESTDIR)$(DMDIR)/pixmaps/Stars.jpg: pixmaps/Stars.jpg
+-	$(INSTALL_DATA) -D pixmaps/Stars.jpg $@
++	$(INSTALL_DATA) pixmaps/Stars.jpg $@
+ 
+ $(DESTDIR)$(DMDIR)/pixmaps/StarsLogo.jpg: pixmaps/StarsLogo.jpg
+-	$(INSTALL_DATA) -D pixmaps/StarsLogo.jpg $@
++	$(INSTALL_DATA) pixmaps/StarsLogo.jpg $@
+ 
+ include/gnuLogo.xpm: pixmaps/gnuLogo.xpm
+ 	ln -s ../pixmaps/gnuLogo.xpm $@
+ 
+ $(DESTDIR)$(DMDIR)/pixmaps/gnuLogo.xpm: pixmaps/gnuLogo.xpm
+-	$(INSTALL_DATA) -D pixmaps/gnuLogo.xpm $@
++	$(INSTALL_DATA) pixmaps/gnuLogo.xpm $@
+ 
+ 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 $@
+ 
+ 
+