diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-07-11 19:03:51 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-07-11 19:03:51 +0000 |
| commit | a94ad5027210251519855ee1aa85725cfeafd602 (patch) | |
| tree | 6063e97b3e1baffdf343abb5e84a96403b3153fe /app | |
| parent | 83d7cf0b7ffb0ac0554f0a9496e571d42d4f1062 (diff) | |
Remove Xstartup and Xreset script. Xenodm uses GiveConsole and TakeConsole
Diffstat (limited to 'app')
| -rw-r--r-- | app/xenodm/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | app/xenodm/config/Makefile.am | 4 | ||||
| -rw-r--r-- | app/xenodm/configure.ac | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/app/xenodm/Makefile.bsd-wrapper b/app/xenodm/Makefile.bsd-wrapper index f2a87b5b3..63bc02b61 100644 --- a/app/xenodm/Makefile.bsd-wrapper +++ b/app/xenodm/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2016/10/23 08:30:37 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2018/07/11 19:03:50 matthieu Exp $ .include <bsd.own.mk> XENODMCONFIGDIR=/etc/X11/xenodm @@ -25,7 +25,7 @@ realinstall: XENODMCONFIGFILES= \ xenodm-config Xresources Xservers XENODMCONFIGSCRIPTS= \ - Xsession GiveConsole TakeConsole Xsetup_0 Xstartup Xreset + Xsession GiveConsole TakeConsole Xsetup_0 afterinstall: $(INSTALL_DATA) ${.CURDIR}/config/OpenBSD_1bpp.xpm $(DESTDIR)$(PIXMAPDIR) diff --git a/app/xenodm/config/Makefile.am b/app/xenodm/config/Makefile.am index 5af005d2d..e551cadd7 100644 --- a/app/xenodm/config/Makefile.am +++ b/app/xenodm/config/Makefile.am @@ -9,9 +9,7 @@ xenodmconfig_DATA = \ Xservers xenodmscript_SCRIPTS = \ - Xreset \ - Xsession \ - Xstartup + Xsession dist_xenodmscript_SCRIPTS = \ GiveConsole \ diff --git a/app/xenodm/configure.ac b/app/xenodm/configure.ac index 76702564e..5e1230f20 100644 --- a/app/xenodm/configure.ac +++ b/app/xenodm/configure.ac @@ -328,10 +328,8 @@ AC_CONFIG_FILES([Makefile include/Makefile man/Makefile xenodm/Makefile - config/Xreset config/Xresources config/Xservers config/Xsession - config/Xstartup config/xenodm-config]) AC_OUTPUT |