[Lunar-commits] CVS: moonbase/graphics/glut BUILD, 1.3, 1.4 BUILD.alpha, 1.1, 1.2

[Aaron Watry]

Update of /var/cvs/lunar/moonbase/graphics/glut
In directory espresso.foo-projects.org:/tmp/cvs-serv5390

Modified Files:
	BUILD BUILD.alpha 
Log Message:
fixing issues with /usr/X11R6/bin not being in path. xmkmf failed when 
/usr/X11R6/bin wasn't in path, because it was just calling imake, 
without checking where it was.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/glut/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	20 Sep 2004 13:23:20 -0000	1.3
+++ BUILD	22 Feb 2005 03:12:24 -0000	1.4
@@ -1,9 +1,9 @@
 (
-
+  export PATH=${PATH}:/usr/X11R6/bin
   cp linux/Glut.cf Glut.cf                                      &&
   sedit "s:\$(TOP)/../lib/libMesa:/usr/X11R6/lib/lib:" Glut.cf  &&
-  /usr/X11R6/bin/imake -DUseInstalled -I/usr/X11R6/lib/X11/config -DTOPDIR=. &&
-  /usr/X11R6/bin/xmkmf -a                                       &&
+  imake -DUseInstalled -I/usr/X11R6/lib/X11/config -DTOPDIR=. &&
+  xmkmf -a                                       &&
   cp linux/Makefile lib/glut/Makefile                           &&
   sedit "s:,libglut.so.3:,libglut.so.3,-L/usr/X11R6/lib,-lX11,-lGL,-lGLU,-lXi,-lXmu:" lib/glut/Makefile                                         &&
   sedit "s:-O2 -m486: $CFLAGS:g" lib/glut/Makefile              &&

Index: BUILD.alpha
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/glut/BUILD.alpha,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD.alpha	9 Dec 2003 19:49:26 -0000	1.1
+++ BUILD.alpha	22 Feb 2005 03:12:24 -0000	1.2
@@ -1,4 +1,5 @@
 (
+  export PATH=${PATH}:/usr/X11R6/bin
      MESA_FIX="s/\$(TOP)\/..\/lib\/libMesa/\/usr\/X11R6\/lib\/lib/"
   SYMBOL_LIBS="-L/usr/X11R6/lib,-lX11,-lGL,-lGLU,-lXi,-lXmu"
    SYMBOL_FIX="s:,libglut.so.3:,libglut.so.3,$SYMBOL_LIBS:"
@@ -12,8 +13,8 @@
 
   cp     Glut.cf  Glut.cf.bak                                   &&
   sed    $MESA_FIX < linux/Glut.cf > Glut.cf                    &&
-  /usr/X11R6/bin/imake -DUseInstalled -I/usr/X11R6/lib/X11/config -DTOPDIR=. &&
-  /usr/X11R6/bin/xmkmf -a                                       &&
+  imake -DUseInstalled -I/usr/X11R6/lib/X11/config -DTOPDIR=.   &&
+  xmkmf -a                                                      &&
   cp     lib/glut/Makefile lib/glut/Makefile.bak                &&
   sed    $MESA_FIX    <     linux/Makefile                      |
   sed    $SYMBOL_FIX  >  lib/glut/Makefile                      &&