[Lunar-commits] r20185 - in moonbase/branches/crater/xorg-7.0: mesa-glu mesa-lib

[Moritz Heiber]

Author: moe
Date: 2006-05-23 12:09:41 +0000 (Tue, 23 May 2006)
New Revision: 20185

Modified:
   moonbase/branches/crater/xorg-7.0/mesa-glu/BUILD
   moonbase/branches/crater/xorg-7.0/mesa-glu/CONFLICTS
   moonbase/branches/crater/xorg-7.0/mesa-lib/CONFLICTS
Log:
Fixes



Modified: moonbase/branches/crater/xorg-7.0/mesa-glu/BUILD
===================================================================
--- moonbase/branches/crater/xorg-7.0/mesa-glu/BUILD	2006-05-23 12:02:56 UTC (rev 20184)
+++ moonbase/branches/crater/xorg-7.0/mesa-glu/BUILD	2006-05-23 12:09:41 UTC (rev 20185)
@@ -12,7 +12,7 @@
   prepare_install &&
 
   cp -a lib/libGLU.so* ${MESA_PREFIX}/lib/ &&
-  cp -a include/GL/glu*.h ${MESA_PREFIX}/include/ &&
+  cp -a include/GL/glu*.h ${MESA_PREFIX}/include/GL/ &&
 
   install -m644 include/GLView.h \
   	  $MESA_PREFIX/include &&

Modified: moonbase/branches/crater/xorg-7.0/mesa-glu/CONFLICTS
===================================================================
--- moonbase/branches/crater/xorg-7.0/mesa-glu/CONFLICTS	2006-05-23 12:02:56 UTC (rev 20184)
+++ moonbase/branches/crater/xorg-7.0/mesa-glu/CONFLICTS	2006-05-23 12:09:41 UTC (rev 20185)
@@ -1,2 +1,3 @@
 conflicts XOrg &&
-conflicts XOrg-test
+conflicts XOrg-test &&
+conflicts mesa-lib

Modified: moonbase/branches/crater/xorg-7.0/mesa-lib/CONFLICTS
===================================================================
--- moonbase/branches/crater/xorg-7.0/mesa-lib/CONFLICTS	2006-05-23 12:02:56 UTC (rev 20184)
+++ moonbase/branches/crater/xorg-7.0/mesa-lib/CONFLICTS	2006-05-23 12:09:41 UTC (rev 20185)
@@ -2,4 +2,5 @@
 conflicts XOrg-test &&
 conflicts NVIDIA &&
 conflicts NVIDIA-old &&
-conflicts fglrx
+conflicts fglrx &&
+conflicts mesa-glu