[Lunar-commits] CVS: theedge/var/lib/lunar/functions build.lunar, 1.16, 1.17

[Steven Michaelske]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv26977

Modified Files:
	build.lunar 
Log Message:
This is the fix to bug 432.
Where the make alias isn't being used while linning.
This also will fix open mosix builds too.
http://bugs.lunar-linux.org/view_bug_page.php?f_id=0000432


Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- build.lunar	29 Dec 2003 18:09:42 -0000	1.16
+++ build.lunar	11 Jan 2004 22:33:22 -0000	1.17
@@ -22,6 +22,8 @@
 #                                                          #
 # Parts Copyrighted Kagan Kongar 2002 under GPLv2          #
 #                                                          #
+# Parts Copyrighted Steven Michalske 2004 under GPLv2      #
+#                                                          #
 ############################################################
 
 
@@ -181,7 +183,20 @@
 default_make() {
   debug_msg "default_make ($@)"
   verbose_msg "running \"default_make\""
-  make                               &&
+  # This code is simular to the optimize_make
+  # function from optimize.lunar
+  # This is needed because bash does not expand aliases in functions
+  if module_installed linux-openmosix; then
+    if [[ "$MAKES" > 1 ]] ; then
+      mosrun -h make -j$MAKES
+      else
+      mosrun -h make
+    fi
+  elif [[ $MAKES > 1 ]] ; then
+    make -j$MAKES
+  else
+    make
+  fi                                 &&
   prepare_install                    &&
   make    install
 } > $C_FIFO 2>&1