[src/trunk]: src/external/mit/xorg/bin/xdm/config - clean up a little and avo...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0af55675d5e2
branches:  trunk
changeset: 997401:0af55675d5e2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Mar 06 05:21:50 2019 +0000

description:
- clean up a little and avoid leaving partial files
- put SEDSCRIPTS into FILES vs CONFIGFILES, so they're install properly

diffstat:

 external/mit/xorg/bin/xdm/config/Makefile |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 47076c04ba5b -r 0af55675d5e2 external/mit/xorg/bin/xdm/config/Makefile
--- a/external/mit/xorg/bin/xdm/config/Makefile Wed Mar 06 05:11:13 2019 +0000
+++ b/external/mit/xorg/bin/xdm/config/Makefile Wed Mar 06 05:21:50 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2019/03/06 04:43:50 christos Exp $
+#      $NetBSD: Makefile,v 1.17 2019/03/06 05:21:50 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -31,6 +31,7 @@
 
 .in:
        ${_MKTARGET_CREATE}
+       rm -f ${.TARGET}
        ${TOOL_SED} \
                -e '/ifdef XPM/d' -e '/endif \/\* XPM \*\//d' \
                -e 's,BITMAPDIR,${X11INCDIR}/X11/pixmaps,' \
@@ -56,14 +57,17 @@
                -e 's,XHASH,\#,' \
                -e 's,\<NLBS\>,\\n\\,' \
                -e 's,\<BS\>,\\,' \
-               -e 's,/\*\*/,,g' < ${.IMPSRC} > ${.TARGET}
+               -e 's,/\*\*/,,g' \
+               < ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+
+CLEANFILES+=   ${SEDSCRIPTS} ${SEDSCRIPTS:=.tmp}
 
 CONFIGFILES+=          GiveConsole TakeConsole \
-                       Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
-                       ${SEDSCRIPTS} 
+                       Xaccess Xservers.fs Xsession Xsetup_0 Xwilling
 FILES+=                        xorg-bw.xpm xorg.xpm \
                        NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm \
-                       NetBSD-flag.png NetBSD-flag1.xpm NetBSD-flag2.xpm
+                       NetBSD-flag.png NetBSD-flag1.xpm NetBSD-flag2.xpm \
+                       ${SEDSCRIPTS} 
 FILESDIR=              ${XDMDIR}
 FILESDIR_xorg.xpm=     ${X11INCDIR}/X11/pixmaps
 FILESDIR_xorg-bw.xpm=  ${X11INCDIR}/X11/pixmaps