[Lunar-commits] CVS: moonbase/x11/XOrg BUILD,1.4,1.5

[Auke Kok]

Update of /var/cvs/lunar/moonbase/x11/XOrg
In directory dbguin.lunar-linux.org:/tmp/cvs-serv27980

Modified Files:
	BUILD 
Log Message:
Even better: put it all in host.def in the build tree, and use bad_flags to sed out the bad stuff...


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/BUILD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BUILD	9 Jul 2004 08:26:51 -0000	1.4
+++ BUILD	9 Jul 2004 08:57:20 -0000	1.5
@@ -16,22 +16,16 @@
 
   message "Building XOrg takes a very long time."
 
-  echo  "#define  InstallXdmConfig    YES"  >>  config/cf/site.def
-  echo  "#define  InstallXinitConfig  YES"  >>  config/cf/site.def
-
-  export CFLAGS=`echo $CFLAGS | sed s/-funroll-loops//`
-  export CFLAGS=`echo $CFLAGS | sed s/-ffast-math//`
-  export CXXFLAGS=`echo $CXXFLAGS | sed s/-funroll-loops//`
-  export CXXFLAGS=`echo $CXXFLAGS | sed s/-ffast-math//`
-  export CPPFLAGS=`echo $CPPFLAGS | sed s/-funroll-loops//`
-  export CPPFLAGS=`echo $CPPFLAGS | sed s/-ffast-math//`
+  bad_flags '-funroll-loops' '-ffast-math'
 
   # first copy the stored settings over:
   cp $CONFIG_CACHE/host.def config/cf/host.def &&
 
   # then add stuff on the fly:
+  echo  "#define InstallXdmConfig YES"          >> config/cf/host.def &&
+  echo  "#define InstallXinitConfig YES"        >> config/cf/host.def &&
   if module_installed Linux-PAM ; then
-    echo "#define HasPam YES" >> config/cf/site.def
+    echo "#define HasPam YES"                   >> config/cf/host.def &&
   fi &&
 
   echo  "#define DefaultCCOptions      $CFLAGS" >> config/cf/host.def &&