summaryrefslogtreecommitdiff
path: root/source/x/x11/post-install
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11/post-install')
-rw-r--r--source/x/x11/post-install/twm/xinitrc.twm4
-rw-r--r--source/x/x11/post-install/util-macros.post-install2
-rw-r--r--source/x/x11/post-install/xdm.post-install3
-rw-r--r--source/x/x11/post-install/xf86-input-synaptics.post-install2
-rw-r--r--source/x/x11/post-install/xf86-input-wacom.post-install4
5 files changed, 12 insertions, 3 deletions
diff --git a/source/x/x11/post-install/twm/xinitrc.twm b/source/x/x11/post-install/twm/xinitrc.twm
index 1bb5185e..fb97e2e2 100644
--- a/source/x/x11/post-install/twm/xinitrc.twm
+++ b/source/x/x11/post-install/twm/xinitrc.twm
@@ -3,8 +3,8 @@
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
-sysresources=/usr/lib/X11/xinit/.Xresources
-sysmodmap=/usr/lib/X11/xinit/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
diff --git a/source/x/x11/post-install/util-macros.post-install b/source/x/x11/post-install/util-macros.post-install
new file mode 100644
index 00000000..b25fb344
--- /dev/null
+++ b/source/x/x11/post-install/util-macros.post-install
@@ -0,0 +1,2 @@
+mkdir -p $PKG/usr/lib
+mv $PKG/usr/share/pkgconfig $PKG/usr/lib
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index 05e37163..83dcf788 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -14,3 +14,6 @@ chmod 755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
mv Xservers Xservers.new
mv Xsession Xsession.new
)
+mkdir -p $PKG/var/lib/xdm
+chown root:root $PKG/var/lib/xdm
+chmod 755 $PKG/var/lib/xdm
diff --git a/source/x/x11/post-install/xf86-input-synaptics.post-install b/source/x/x11/post-install/xf86-input-synaptics.post-install
index d7de8a4e..00250982 100644
--- a/source/x/x11/post-install/xf86-input-synaptics.post-install
+++ b/source/x/x11/post-install/xf86-input-synaptics.post-install
@@ -4,6 +4,6 @@ cat fdi/11-x11-synaptics.fdi > \
mkdir -p $PKG/usr/doc/xf86-input-synaptics-$MODULAR_PACKAGE_VERSION
cp -a \
- NEWS README TODO \
+ README TODO \
$PKG/usr/doc/xf86-input-synaptics-$MODULAR_PACKAGE_VERSION
diff --git a/source/x/x11/post-install/xf86-input-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install
new file mode 100644
index 00000000..226678f4
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-wacom.post-install
@@ -0,0 +1,4 @@
+mv $PKG/usr/share/hal/fdi/policy/20thirdparty \
+ $PKG/usr/share/hal/fdi/policy/10osvendor
+mv $PKG/usr/share/hal/fdi/policy/10osvendor/wacom.fdi \
+ $PKG/usr/share/hal/fdi/policy/10osvendor/11-x11-wacom.fdi