[Lunar-commits] CVS: moonbase/graphics/glut BUILD,1.2,1.3

[Auke Kok]

Update of /var/cvs/lunar/moonbase/graphics/glut
In directory espresso.lunar-linux.org:/tmp/cvs-serv7200

Modified Files:
	BUILD 
Log Message:
Cleaned up and added a bit of optimizations to it


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/glut/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	13 Oct 2002 21:10:48 -0000	1.2
+++ BUILD	20 Sep 2004 13:23:20 -0000	1.3
@@ -1,23 +1,18 @@
 (
 
-     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:"
-
-  cp     Glut.cf  Glut.cf.bak                                   &&
-  sed    $MESA_FIX < linux/Glut.cf > Glut.cf                    &&
+  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                                       &&
-  cp     lib/glut/Makefile lib/glut/Makefile.bak                &&
-  sed    $MESA_FIX    <     linux/Makefile                      |
-  sed    $SYMBOL_FIX  >  lib/glut/Makefile                      &&
+  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              &&
   cd     lib/glut                                               &&
   make                                                          &&
   prepare_install                                               &&
   ln     -sf libglut.so.3.7  libglut.so.3                       &&
   ln     -sf libglut.so.3.7  libglut.so                         &&
   cp     -d libglut*        /usr/lib                            &&
-  cd     ../..                                                  &&
-  cp     include/GL/glut.h  /usr/include/GL
+  cp     $SOURCE_DIRECTORY/include/GL/glut.h  /usr/include/GL
 
 ) > $C_FIFO 2>&1