diff options
Diffstat (limited to 'source/x/motif')
| -rwxr-xr-x | source/x/motif/motif.SlackBuild | 7 | ||||
| -rw-r--r-- | source/x/motif/xinitrc.mwm | 33 |
2 files changed, 39 insertions, 1 deletions
diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild index 99ab20a3a..e7f6f0052 100755 --- a/source/x/motif/motif.SlackBuild +++ b/source/x/motif/motif.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=motif VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2 -d - | cut -f 1-3 -d .)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -127,6 +127,11 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Include mwm xinitrc +mkdir -p $PKG/etc/X11/xinit +zcat $CWD/xinitrc.mwm.gz > $PKG/etc/X11/xinit/xinitrc.mwm +chmod 0755 $PKG/etc/X11/xinit/xinitrc.mwm + # This conflicts with a perl manpage: mv $PKG/usr/man/man3/Shell.3 $PKG/usr/man/man3/omShell.3 diff --git a/source/x/motif/xinitrc.mwm b/source/x/motif/xinitrc.mwm new file mode 100644 index 000000000..00de7396b --- /dev/null +++ b/source/x/motif/xinitrc.mwm @@ -0,0 +1,33 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# Start DBUS session bus: +if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval $(dbus-launch --sh-syntax --exit-with-session) +fi + +# Start the window manager: +exec /usr/bin/mwm + |