[Lunar-commits] r24917 - moonbase/trunk/xorg7/x11-proto/xproto

[Samuel Verstraete]

Author: elangelo
Date: 2007-06-19 11:04:37 +0200 (Tue, 19 Jun 2007)
New Revision: 24917

Modified:
   moonbase/trunk/xorg7/x11-proto/xproto/BUILD
Log:
we should not mess with the $PATH variable if not needed... 
this is just a temporary hack
Next step is to check for the MODULE_PREFIX in every BUILD file in XOrg7
so we can completely skip installing x11r7.rc
gr,S.


Modified: moonbase/trunk/xorg7/x11-proto/xproto/BUILD
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xproto/BUILD	2007-06-19 08:14:25 UTC (rev 24916)
+++ moonbase/trunk/xorg7/x11-proto/xproto/BUILD	2007-06-19 09:04:37 UTC (rev 24917)
@@ -1,7 +1,7 @@
 (
 
   if [ ! -h /usr/X11R6 ] && [ -d /usr/X11R6 ]; then
-	message "You still have the remains of XOrg lying around.";
+	message "You still have the remains of XOrg6 lying around.";
 	message "Please make sure you have read the XOrg7 upgrade";
 	message "instructions at:";
 	message "";
@@ -12,9 +12,14 @@
 
   default_build
 
+  touch $SOURCE_DIRECTORY/x11r7.rc
+# we only need this when are installing in a different prefix then /usr  
+  if [ ${MODULE_PREFIX} != /usr ]; then
 	echo export PATH=\""${MODULE_PREFIX}"/bin:'$PATH'\" >> $SOURCE_DIRECTORY/x11r7.rc;
 	echo export PKG_CONFIG_PATH=\""${MODULE_PREFIX}"/lib/pkgconfig:'$PKG_CONFIG_PATH'\" >> $SOURCE_DIRECTORY/x11r7.rc;
-
+  fi
+# we still need to install the x11r7.rc file as it get sourced by all
+# xorg7 modules
 	install -m644 $SOURCE_DIRECTORY/x11r7.rc /etc/profile.d/;
 
 ) > $C_FIFO 2>&1