[Lunar-commits] r20203 - moonbase/branches/crater/xorg-7.0/x11-proto/xproto

[Moritz Heiber]

Author: moe
Date: 2006-05-23 18:25:55 +0000 (Tue, 23 May 2006)
New Revision: 20203

Modified:
   moonbase/branches/crater/xorg-7.0/x11-proto/xproto/BUILD
   moonbase/branches/crater/xorg-7.0/x11-proto/xproto/POST_INSTALL
Log:
Okay, this SHOULD finally fix the xproto related issues



Modified: moonbase/branches/crater/xorg-7.0/x11-proto/xproto/BUILD
===================================================================
--- moonbase/branches/crater/xorg-7.0/x11-proto/xproto/BUILD	2006-05-23 17:43:28 UTC (rev 20202)
+++ moonbase/branches/crater/xorg-7.0/x11-proto/xproto/BUILD	2006-05-23 18:25:55 UTC (rev 20203)
@@ -1,5 +1,15 @@
 (
 
+  if [ ! -h /usr/X11R6 ] && [ -d /usr/X11R6 ]; then
+	message "You still have the remains of XOrg lying around.";
+	message "Please make sure you have read the XOrg7 upgrade";
+	message "instructions at:";
+	message "";
+	message "http://wiki.lunar-linux.org/index.php/Install_XOrg7";
+	message "";
+	exit 1;  
+  fi
+
   default_build
 
   # We only need this if $MODULE_PREFIX is set to something else than /usr

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-23 17:43:28 UTC (rev 20202)
+++ moonbase/branches/crater/xorg-7.0/x11-proto/xproto/POST_INSTALL	2006-05-23 18:25:55 UTC (rev 20203)
@@ -5,13 +5,10 @@
   ldconfig
 fi &&
 
-if [ ! -h /usr/X11R6 ] ; then
-  echo "No symlink. X11R6 exists!";
-  # FIXME: Delete the directory?
-elif [ $(readlink -f /usr/X11R6) != "${MODULE_PREFIX}" ] ; then
-  rm -f /usr/X11R6;
+if [ $(readlink -f /usr/X11R6) != "${MODULE_PREFIX}" ] ; then
+  rm -rf /usr/X11R6;
   ln -sf "${MODULE_PREFIX}" /usr/X11R6;
-  message "Set symlink of /usr/X11R6";
+  message "Set symlink for /usr/X11R6";
 fi
 
 # We need those three symlinks. They are making sure a lot of apps
@@ -23,14 +20,30 @@
   message "General symlink adjusted"
 fi &&
 
-if [ $(readlink -f /usr/include/X11) != "${MODULE_PREFIX}/include/X11" ]; then
-  rm -rf /usr/include/X11;
+if [ -h /usr/include/X11 ] && [ $(readlink -f /usr/include/X11) != "${MODULE_PREFIX}/include/X11" ]; then
+  rm -f /usr/include/X11;
+  mkdir -p "${MODULE_PREFIX}/include/X11";
   ln -sf "${MODULE_PREFIX}/include/X11" /usr/include/X11;
   message "Include symlink adjusted"
 fi
 
-if [ $(readlink -f /usr/lib/X11) != "${MODULE_PREFIX}/lib/X11" ]; then
+if [ -h /usr/lib/X11 ] && [ $(readlink -f /usr/lib/X11) != "${MODULE_PREFIX}/lib/X11" ]; then
   rm -f /usr/lib/X11;
+  mkdir -p "${MODULE_PREFIX}/lib/X11";
   ln -sf "${MODULE_PREFIX}/lib/X11" /usr/lib/X11;
   message "Lib symlink adjusted";
 fi
+
+if [ -h /usr/include/GL ] && [ $(readlink -f /usr/include/GL) != "${MODULE_PREFIX}/include/GL" ]; then
+  rm -f /usr/include/GL;
+  mkdir -p "${MODULE_PREFIX}/include/GL";
+  ln -sf "${MODULE_PREFIX}/include/GL" /usr/include/GL;
+  message "include/GL symlink adjusted";
+fi
+
+if [ -h /usr/lib/GL ] && [ $(readlink -f /usr/lib/GL) != "${MODULE_PREFIX}/lib/GL" ]; then
+  rm -f /usr/lib/GL;
+  mkdir -p "${MODULE_PREFIX}/lib/GL";
+  ln -sf "${MODULE_PREFIX}/lib/GL" /usr/lib/GL;
+  message "lib/GL symlink adjusted";
+fi