summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2018-07-11 19:03:51 +0000
committerMatthieu Herrb <matthieu@herrb.eu>2020-07-14 15:52:41 +0200
commite11c978939747e22e452dc2d834899417d8d9c9c (patch)
treeb050d1099869e88f6a57c9622597b49f9b224645
parentb7a5b9e79ce306e020bb7083a04ca5d327cf7920 (diff)
Remove Xstartup and Xreset script. Xenodm uses GiveConsole and TakeConsole
-rw-r--r--Makefile.bsd-wrapper2
-rw-r--r--config/Makefile.am4
-rw-r--r--configure.ac2
3 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.bsd-wrapper b/Makefile.bsd-wrapper
index e4e7944..6960efb 100644
--- a/Makefile.bsd-wrapper
+++ b/Makefile.bsd-wrapper
@@ -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/config/Makefile.am b/config/Makefile.am
index 5af005d..e551cad 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -9,9 +9,7 @@ xenodmconfig_DATA = \
Xservers
xenodmscript_SCRIPTS = \
- Xreset \
- Xsession \
- Xstartup
+ Xsession
dist_xenodmscript_SCRIPTS = \
GiveConsole \
diff --git a/configure.ac b/configure.ac
index 7670256..5e1230f 100644
--- a/configure.ac
+++ b/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