diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-03-15 19:09:23 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-03-15 19:09:23 +0000 |
| commit | c6d641e1bd5b29406c1dd6a7e0400e434bab085a (patch) | |
| tree | 695db90422c3c2d015e50e55f1331d1da9c01ad0 | |
| parent | 626f1eab8bbb5a098fd757effb6ecaa486379f73 (diff) | |
Repair protection of installed configuration files
| -rw-r--r-- | app/xdm/Makefile.bsd-wrapper | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/xdm/Makefile.bsd-wrapper b/app/xdm/Makefile.bsd-wrapper index ff7943564..9fd4c290d 100644 --- a/app/xdm/Makefile.bsd-wrapper +++ b/app/xdm/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.21 2013/06/26 07:25:19 mpi Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.22 2015/03/15 19:09:22 matthieu Exp $ .include <bsd.own.mk> XDMCONFIGDIR=/etc/X11/xdm @@ -24,10 +24,8 @@ CONFIGURE_ARGS= --enable-privsep \ # avoid clobbering installed config files realinstall: exec ${MAKE} ${_lt_libs} install-strip \ - dist_xdmconfigDATA_INSTALL=: \ - dist_xdmscriptSCRIPT_INSTALL=: \ - xdmscriptSCRIPT_INSTALL=: \ - xdmconfigDATA_INSTALL=: + INSTALL_DATA=: \ + INSTALL_SCRIPT=: XDMCONFIGFILES= \ xdm-config Xresources Xservers Xaccess @@ -39,6 +37,7 @@ afterinstall: $(INSTALL_DATA) ${.CURDIR}/config/OpenBSD_4bpp.xpm $(DESTDIR)$(PIXMAPDIR) $(INSTALL_DATA) ${.CURDIR}/config/OpenBSD_8bpp.xpm $(DESTDIR)$(PIXMAPDIR) $(INSTALL_DATA) ${.CURDIR}/config/OpenBSD_15bpp.xpm $(DESTDIR)$(PIXMAPDIR) + cd man ; $(INSTALL_DATA) xdm.1 $(DESTDIR)$(MANDIR)1/ @cd config ; for f in $(XDMCONFIGFILES); do \ if ! test -f $(DESTDIR)$(XDMCONFIGDIR)/$$f ; then \ if test -f $$f; then d=; else d="$(.CURDIR)/config/"; fi; \ |