[Lunar-commits] r19940 - in moonbase: branches/crater/xorg-7.0/adjusted_mod branches/crater/xorg-7.0/x11-proto/xproto trunk/zbeta/slim

[Moritz Heiber]

Author: moe
Date: 2006-05-04 12:14:23 +0000 (Thu, 04 May 2006)
New Revision: 19940

Removed:
   moonbase/branches/crater/xorg-7.0/adjusted_mod/zbeta/
Modified:
   moonbase/branches/crater/xorg-7.0/x11-proto/xproto/POST_INSTALL
   moonbase/trunk/zbeta/slim/BUILD
Log:
Remove adjusted module slim and update the regular slim module to
work in both ways. Also updated xproto to make an additional
required symlink



Modified: moonbase/branches/crater/xorg-7.0/x11-proto/xproto/POST_INSTALL
===================================================================
--- moonbase/branches/crater/xorg-7.0/x11-proto/xproto/POST_INSTALL	2006-05-04 10:05:01 UTC (rev 19939)
+++ moonbase/branches/crater/xorg-7.0/x11-proto/xproto/POST_INSTALL	2006-05-04 12:14:23 UTC (rev 19940)
@@ -1,3 +1,5 @@
+# Make sure its inside ld.so.conf
+
 if ! grep -q "${X11R7_PREFIX:-/usr/X11R7}/lib" /etc/ld.so.conf ; then
   echo "${X11R7_PREFIX:-/usr/X11R7}/lib" >> /etc/ld.so.conf;
   ldconfig
@@ -3,4 +5,7 @@
 fi &&
 
+# We need those three symlinks. They are making sure a lot of apps
+# don't brake
+
 if [ $(readlink -f /usr/X11) != "${X11R7_PREFIX:-/usr/X11R7}" ]; then
   ln -sf "${X11R7_PREFIX:-/usr/X11R7}" /usr/X11;
@@ -11,3 +16,6 @@
   ln -sf "${X11R7_PREFIX:-/usr/X11R7}/include/X11" /usr/include/X11;
 fi
 
+if [ $(readlink -f /usr/lib/X11) != "${X11R7_PREFIX:-/usr/X11R7}/lib/X11" ]; then
+  ln -sf "${X11R7_PREFIX:-/usr/X11R7}/lib/X11" /usr/lib/X11;
+fi

Modified: moonbase/trunk/zbeta/slim/BUILD
===================================================================
--- moonbase/trunk/zbeta/slim/BUILD	2006-05-04 10:05:01 UTC (rev 19939)
+++ moonbase/trunk/zbeta/slim/BUILD	2006-05-04 12:14:23 UTC (rev 19940)
@@ -1,3 +1,6 @@
 (
-default_make
+  sedit "s/X11R6/X11/g" Makefile
+
+  default_make
+
 ) > $C_FIFO 2>&1