summaryrefslogtreecommitdiff
path: root/source/x/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/mesa')
-rw-r--r--source/x/mesa/doinst.sh6
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild4
2 files changed, 8 insertions, 2 deletions
diff --git a/source/x/mesa/doinst.sh b/source/x/mesa/doinst.sh
index 42c4667c..d6297d69 100644
--- a/source/x/mesa/doinst.sh
+++ b/source/x/mesa/doinst.sh
@@ -10,4 +10,8 @@ config() {
fi
# Otherwise, we leave the .new copy for the admin to consider...
}
-config etc/drirc.new
+# Don't mess with /etc/drirc. Mesa now installs the defaults as
+# /usr/share/drirc.d/00-mesa-defaults.conf. We won't protect that
+# as a .new file as it shouldn't be modified. Create /etc/drirc if
+# you need local overrides.
+#config etc/drirc.new
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 523f0860..ee8d7c26 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -148,7 +148,9 @@ make install DESTDIR=$PKG || exit 1
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
# Install /etc/drirc as a .new file:
-mv $PKG/etc/drirc $PKG/etc/drirc.new
+if [ -r $PKG/etc/drirc ]; then
+ mv $PKG/etc/drirc $PKG/etc/drirc.new
+fi
# Now build/install a small subset of the demos:
export CWD SLKCFLAGS NUMJOBS PKG